aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 20:39:38 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 20:39:38 -0500
commit0caab23e11c015559af81a4c0f4759ca05a5446a (patch)
tree590fb83c4427c129fa2ceb3d592d3800fa51e172 /drivers
parent80576fd86b350a90c5be329de1e382d31121a8d0 (diff)
scsi: link in the debug driver last
If the debug driver is built-in, link it in last, so that any real drivers will probe first, rather than having the debug driver pick the first scsi slots.. Signed-off-by: Douglas Gilbert <dougg@torque.net> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 15dc2e00e1b2..e513c3158ad9 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -117,7 +117,6 @@ obj-$(CONFIG_SCSI_PPA) += ppa.o
117obj-$(CONFIG_SCSI_IMM) += imm.o 117obj-$(CONFIG_SCSI_IMM) += imm.o
118obj-$(CONFIG_JAZZ_ESP) += NCR53C9x.o jazz_esp.o 118obj-$(CONFIG_JAZZ_ESP) += NCR53C9x.o jazz_esp.o
119obj-$(CONFIG_SUN3X_ESP) += NCR53C9x.o sun3x_esp.o 119obj-$(CONFIG_SUN3X_ESP) += NCR53C9x.o sun3x_esp.o
120obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
121obj-$(CONFIG_SCSI_FCAL) += fcal.o 120obj-$(CONFIG_SCSI_FCAL) += fcal.o
122obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o 121obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o
123obj-$(CONFIG_SCSI_NSP32) += nsp32.o 122obj-$(CONFIG_SCSI_NSP32) += nsp32.o
@@ -148,6 +147,9 @@ obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
148obj-$(CONFIG_CHR_DEV_SG) += sg.o 147obj-$(CONFIG_CHR_DEV_SG) += sg.o
149obj-$(CONFIG_CHR_DEV_SCH) += ch.o 148obj-$(CONFIG_CHR_DEV_SCH) += ch.o
150 149
150# This goes last, so that "real" scsi devices probe earlier
151obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
152
151scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ 153scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \
152 scsicam.o scsi_error.o scsi_lib.o \ 154 scsicam.o scsi_error.o scsi_lib.o \
153 scsi_scan.o scsi_sysfs.o \ 155 scsi_scan.o scsi_sysfs.o \