diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/scsi/Makefile | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 15ba33c8f..2324184d1 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -58,7 +58,7 @@ else endif ifeq ($(CONFIG_BLK_DEV_SD),y) -L_OBJS += sd.o sd_ioctl.o +L_OBJS += sd.o else ifeq ($(CONFIG_BLK_DEV_SD),m) M_OBJS += sd_mod.o @@ -265,14 +265,22 @@ else endif endif -ifeq ($(CONFIG_MAC_SCSI_OLD),y) +ifeq ($(CONFIG_MAC_SCSI),y) L_OBJS += mac_scsi.o else - ifeq ($(CONFIG_MAC_SCSI_OLD),m) + ifeq ($(CONFIG_MAC_SCSI),m) M_OBJS += mac_scsi.o endif endif +ifeq ($(CONFIG_SUN3_SCSI),y) +L_OBJS += sun3_scsi.o +else + ifeq ($(CONFIG_SUN3_SCSI),m) + M_OBJS += sun3_scsi.o + endif +endif + ifeq ($(CONFIG_SCSI_MAC_ESP),y) L_OBJS += mac_esp.o NCR53C9x.o else @@ -725,5 +733,5 @@ scsi_mod.o: $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.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 -sd_mod.o: sd.o sd_ioctl.o - $(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o +sd_mod.o: sd.o + $(LD) $(LD_RFLAG) -r -o $@ sd.o |