o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 86 insertions, 11 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 892f81e23..58aca955c 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -23,7 +23,7 @@ CFLAGS_seagate.o =   -DARBITRATE -DSLOW_HANDSHAKE -DFAST32 -DPARITY
 ifeq (${CFLAGS},)
 CFLAGS = -D__KERNEL__=1 \
 	-DMODULE -Wall -Wstrict-prototypes -I. -I../../include \
-	-O2 -fomit-frame-pointer -m486
+	-O2 -fomit-frame-pointer
 
 include ../../.config
 
@@ -115,6 +115,22 @@ else
     endif
 endif
 
+ifeq ($(CONFIG_MVME16x_SCSI),y)
+L_OBJS += mvme16x.o 53c7xx.o
+else
+  ifeq ($(CONFIG_MVME16x_SCSI),m)
+  M_OBJS += mvme16x.o 53c7xx.o
+  endif
+endif
+
+ifeq ($(CONFIG_BVME6000_SCSI),y)
+L_OBJS += bvme6000.o 53c7xx.o
+else
+  ifeq ($(CONFIG_BVME6000_SCSI),m)
+  M_OBJS += bvme6000.o 53c7xx.o
+  endif
+endif
+
 ifeq ($(CONFIG_A4000T_SCSI),y)
 L_OBJS += amiga7xx.o 53c7xx.o
 else
@@ -171,6 +187,54 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_SCSI_SGIWD93),y)
+L_OBJS += sgiwd93.o wd33c93.o
+else
+  ifeq ($(CONFIG_SCSI_SGIWD93),m)
+  M_OBJS += sgiwd93.o wd33c93.o
+  endif
+endif
+
+ifeq ($(CONFIG_CYBERSTORM_SCSI),y)
+L_OBJS += NCR53C9x.o cyberstorm.o
+else
+  ifeq ($(CONFIG_CYBERSTORM_SCSI),m)
+  M_OBJS += NCR53C9x.o cyberstorm.o
+  endif
+endif
+
+ifeq ($(CONFIG_CYBERSTORMII_SCSI),y)
+L_OBJS += NCR53C9x.o cyberstormII.o
+else
+  ifeq ($(CONFIG_CYBERSTORMII_SCSI),m)
+  M_OBJS += NCR53C9x.o cyberstormII.o
+  endif
+endif
+
+ifeq ($(CONFIG_BLZ2060_SCSI),y)
+L_OBJS += NCR53C9x.o blz2060.o
+else
+  ifeq ($(CONFIG_BLZ2060_SCSI),m)
+  M_OBJS += NCR53C9x.o blz2060.o
+  endif
+endif
+
+ifeq ($(CONFIG_BLZ1230_SCSI),y)
+L_OBJS += NCR53C9x.o blz1230.o
+else
+  ifeq ($(CONFIG_BLZ1230_SCSI),m)
+  M_OBJS += NCR53C9x.o blz1230.o
+  endif
+endif
+
+ifeq ($(CONFIG_FASTLANE_SCSI),y)
+L_OBJS += NCR53C9x.o fastlane.o
+else
+  ifeq ($(CONFIG_FASTLANE_SCSI),m)
+  M_OBJS += NCR53C9x.o fastlane.o
+  endif
+endif
+
 ifeq ($(CONFIG_ATARI_SCSI),y)
 L_OBJS += atari_scsi.o
 else
@@ -286,10 +350,10 @@ else
 endif
 
 ifeq ($(CONFIG_SCSI_SUNESP),y)
-L_OBJS += esp.o
+L_OBJS += esp.o sparc_esp.o
 else
   ifeq ($(CONFIG_SCSI_SUNESP),m)
-  M_OBJS += esp.o
+  M_OBJS += esp.o sparc_esp.o
   endif
 endif
 
@@ -474,21 +538,32 @@ ifeq ($(CONFIG_JAZZ_ESP),y)
 L_OBJS += NCR53C9x.o jazz_esp.o
 endif
 
+ifeq ($(CONFIG_JAZZ_ESP),y)
+L_OBJS += esp.o jazz_esp.o
+endif
+
 include $(TOPDIR)/Rules.make
 
-53c8xx_d.h 53c8xx_u.h : 53c7,8xx.scr script_asm.pl
-	ln -sf 53c7,8xx.scr fake.c
-	$(CPP) -traditional -DCHIP=810 fake.c | grep -v '^#' | perl script_asm.pl 
+53c8xx_d.h: 53c7,8xx.scr script_asm.pl
+	ln -sf 53c7,8xx.scr fake8.c
+	$(CPP) -traditional -DCHIP=810 fake8.c | grep -v '^#' | perl script_asm.pl 
 	mv script.h 53c8xx_d.h
 	mv scriptu.h 53c8xx_u.h
-	rm fake.c
+	rm fake8.c
+
+53c8xx_u.h: 53c8xx_d.h
 
-53c7xx_d.h 53c7xx_u.h : 53c7xx.scr script_asm.pl
-	ln -sf 53c7xx.scr fake.c
-	$(CPP) -traditional -DCHIP=710 fake.c | grep -v '^#' | perl -s script_asm.pl -ncr7x0_family
+53c7xx_d.h: 53c7xx.scr script_asm.pl
+	ln -sf 53c7xx.scr fake7.c
+	$(CPP) -traditional -DCHIP=710 fake7.c | grep -v '^#' | perl -s script_asm.pl -ncr7x0_family
 	mv script.h 53c7xx_d.h
 	mv scriptu.h 53c7xx_u.h
-	rm fake.c
+	rm fake7.c
+
+53c7xx_u.h: 53c7xx_d.h
+
+53c7xx.o : 53c7xx_d.h 53c7xx.c
+	$(CC) $(CFLAGS) -c 53c7xx.c
 
 scsi_mod.o: $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \
 		scsicam.o scsi_proc.o scsi_error.o scsi_obsolete.o scsi_queue.o