summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/scsi/Makefile
parent0bd079751d25808d1972baee5c4eaa1db2227257 (diff)
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/scsi/Makefile')
-rw-r--r--drivers/scsi/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 8cf0d3bda..af4a242ff 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -322,6 +322,14 @@ else
endif
endif
+ifeq ($(CONFIG_SCSI_QLOGIC_1280),y)
+L_OBJS += qla1280.o
+else
+ ifeq ($(CONFIG_SCSI_QLOGIC_1280),m)
+ M_OBJS += qla1280.o
+ endif
+endif
+
ifeq ($(CONFIG_SCSI_ACARD),y)
L_OBJS += atp870u.o
else