Skip to contentSkip to conversation

avoid two sym53c8xx names

PATCH In review Xose Vazquez Perez 1 participant 2 messages May 11, 2003

Subsystems (2)
SCSI LSI Logic/symbios/ncr 53C8XX and 53C1010 PCI-SCSI drivers
lore
Share & tools
lore

Xose Vazquez Perez

author
#0 lore raw

PATCH 1/1 avoid two sym53c8xx names

hi,

To avoid that it has two modules with same name:

patch for 2.4.21-rc2:
--cut--

drivers/scsi/Makefile 2003-05-11 03:52:41.000000000 +0200 renamed from drivers/scsi/Makefile 2003-05-11 02:53:40.000000000 +0200 +1 -1
diff -Nuar linux/drivers/scsi/Makefile linux.xose/drivers/scsi/Makefile
@@ -97,7 +97,7 @@
 obj-$(CONFIG_SCSI_NCR53C7xx)   += 53c7,8xx.o
 subdir-$(CONFIG_SCSI_SYM53C8XX_2)      += sym53c8xx_2
 ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
-  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx.o
+  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx_2.o
 endif
 obj-$(CONFIG_SCSI_SYM53C8XX)   += sym53c8xx.o
 obj-$(CONFIG_SCSI_NCR53C8XX)   += ncr53c8xx.o

--end--

-thanks-

regards,

Signature · 1 line
Galiza nin perdoa nin esquence. Governo demision!
author
#1 lore raw
Quoted 10 lines · Xose Vazquez Perez

hi,

To avoid that it has two modules with same name:

patch for 2.4.21-rc2:
--cut--
diff -Nuar linux/drivers/scsi/Makefile linux.xose/drivers/scsi/Makefile

drivers/scsi/Makefile 2003-05-11 03:52:41.000000000 +0200 line 103

Quoted 8 lines
drivers/scsi/Makefile 2003-05-11 03:52:41.000000000 +0200 renamed from drivers/scsi/Makefile 2003-05-11 02:53:40.000000000 +0200 +1 -1
@@ -97,7 +97,7 @@
 obj-$(CONFIG_SCSI_NCR53C7xx)   += 53c7,8xx.o
 subdir-$(CONFIG_SCSI_SYM53C8XX_2)      += sym53c8xx_2
 ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
-  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx.o
+  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx_2.o
 endif
 obj-$(CONFIG_SCSI_SYM53C8XX)   += sym53c8xx.o
 obj-$(CONFIG_SCSI_NCR53C8XX)   += ncr53c8xx.o

regards,

I am sorry, I forgot the other makefile

--cut--

drivers/scsi/Makefile 2003-05-11 03:52:41.000000000 +0200 renamed from drivers/scsi/Makefile 2003-05-11 02:53:40.000000000 +0200 +1 -1
diff -Nuar linux/drivers/scsi/Makefile linux.xose/drivers/scsi/Makefile
@@ -97,7 +97,7 @@
 obj-$(CONFIG_SCSI_NCR53C7xx)   += 53c7,8xx.o
 subdir-$(CONFIG_SCSI_SYM53C8XX_2)      += sym53c8xx_2
 ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
-  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx.o
+  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx_2.o
 endif
 obj-$(CONFIG_SCSI_SYM53C8XX)   += sym53c8xx.o
 obj-$(CONFIG_SCSI_NCR53C8XX)   += ncr53c8xx.o
drivers/scsi/sym53c8xx_2/Makefile 2003-05-11 06:10:04.000000000 +0200 renamed from drivers/scsi/sym53c8xx_2/Makefile 2001-11-10 00:22:54.000000000 +0100 +5 -6
diff -Nuar linux/drivers/scsi/sym53c8xx_2/Makefile linux.xose/drivers/scsi/sym53c8xx_2/Makefile
@@ -1,14 +1,14 @@
 # File: drivers/sym53c8xx/Makefile
 # Makefile for the NCR/SYMBIOS/LSI 53C8XX PCI SCSI controllers driver.
 
-list-multi := sym53c8xx.o
-sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
-obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o
+list-multi := sym53c8xx_2.o
+sym53c8xx_2-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
+obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx_2.o
 
 EXTRA_CFLAGS += -I.
 
-sym53c8xx.o: $(sym53c8xx-objs)
-       $(LD) -r -o $@ $(sym53c8xx-objs)
+sym53c8xx_2.o: $(sym53c8xx_2-objs)
+       $(LD) -r -o $@ $(sym53c8xx_2-objs)
 
 include $(TOPDIR)/Rules.make
--end--
Signature · 1 line
Galiza nin perdoa nin esquence. Governo demision!