diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/scsi/Makefile | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index b4fed17cf..8cf0d3bda 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -41,7 +41,7 @@ ifeq ($(CONFIG_SCSI),y) endif L_OBJS += scsi_n_syms.o hosts.o scsi_ioctl.o constants.o scsicam.o L_OBJS += scsi_error.o scsi_obsolete.o scsi_queue.o scsi_lib.o - L_OBJS += scsi_merge.o scsi_proc.o + L_OBJS += scsi_merge.o scsi_proc.o scsi_dma.o scsi_scan.o else ifeq ($(CONFIG_SCSI),m) MIX_OBJS += scsi_syms.o @@ -679,6 +679,14 @@ ifeq ($(CONFIG_SUN3X_ESP),y) L_OBJS += NCR53C9x.o sun3x_esp.o endif +ifeq ($(CONFIG_BLK_DEV_3W_XXXX_RAID),y) +L_OBJS += 3w-xxxx.o +else + ifeq ($(CONFIG_BLK_DEV_3W_XXXX_RAID),m) + M_OBJS += 3w-xxxx.o + endif +endif + include $(TOPDIR)/Rules.make 53c8xx_d.h: 53c7,8xx.scr script_asm.pl @@ -726,10 +734,11 @@ megaraid.o: megaraid.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 scsi_lib.o scsi_merge.o + scsi_queue.o scsi_lib.o scsi_merge.o scsi_dma.o scsi_scan.o $(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o \ constants.o scsicam.o scsi_proc.o scsi_merge.o \ - scsi_error.o scsi_obsolete.o scsi_queue.o scsi_lib.o + scsi_error.o scsi_obsolete.o scsi_queue.o scsi_lib.o \ + scsi_dma.o scsi_scan.o sr_mod.o: sr.o sr_ioctl.o sr_vendor.o $(LD) $(LD_RFLAG) -r -o $@ sr.o sr_ioctl.o sr_vendor.o |