patch-2.4.3 linux/drivers/scsi/pcmcia/Makefile

• Lines: 44
• Date: Mon Mar 26 15:36:30 2001
• Orig file: v2.4.2/linux/drivers/scsi/pcmcia/Makefile
• Orig date: Fri Dec 29 14:07:22 2000

diff -u --recursive --new-file v2.4.2/linux/drivers/scsi/pcmcia/Makefile linux/drivers/scsi/pcmcia/Makefile
@@ -12,7 +12,6 @@
 vpath %c ..
 
 CFLAGS_aha152x.o = -DPCMCIA -D__NO_VERSION__ -DAHA152X_STAT
-CFLAGS_aic7xxx.o = -DPCMCIA -D__NO_VERSION__
 CFLAGS_fdomain.o = -DPCMCIA -D__NO_VERSION__
 CFLAGS_qlogicfas.o = -DPCMCIA -D__NO_VERSION__
 
@@ -21,25 +20,18 @@
 obj-$(CONFIG_PCMCIA_FDOMAIN)	+= fdomain_cs.o
 obj-$(CONFIG_PCMCIA_AHA152X)	+= aha152x_cs.o
 
-# Cardbus client drivers
-obj-$(CONFIG_PCMCIA_APA1480)	+= apa1480_cb.o
-
-list-multi	:= qlogic_cs.o fdomain_cs.o aha152x_cs.o apa1480_cb.o
-aha152x-objs	:= aha152x_stub.o aha152x.o
-apa1480-objs	:= apa1480_stub.o aic7xxx.o
-fdomain-objs	:= fdomain_stub.o fdomain.o
-qlogic-objs	:= qlogic_stub.o qlogicfas.o
+list-multi	:= qlogic_cs.o fdomain_cs.o aha152x_cs.o
+aha152x_cs-objs	:= aha152x_stub.o aha152x.o
+fdomain_cs-objs	:= fdomain_stub.o fdomain.o
+qlogic_cs-objs	:= qlogic_stub.o qlogicfas.o
 
 include $(TOPDIR)/Rules.make
 
-aha152x_cs.o: $(aha152x-objs)
-	$(LD) -r -o $@ $(aha152x-objs)
-
-apa1480_cb.o: $(apa1480-objs)
-	$(LD) -r -o $@ $(apa1480-objs)
+aha152x_cs.o: $(aha152x_cs-objs)
+	$(LD) -r -o $@ $(aha152x_cs-objs)
 
-fdomain_cs.o: $(fdomain-objs)
-	$(LD) -r -o $@ $(fdomain-objs)
+fdomain_cs.o: $(fdomain_cs-objs)
+	$(LD) -r -o $@ $(fdomain_cs-objs)
 
-qlogic_cs.o: $(qlogic-objs)
-	$(LD) -r -o $@ $(qlogic-objs)
+qlogic_cs.o: $(qlogic_cs-objs)
+	$(LD) -r -o $@ $(qlogic_cs-objs)