From: Linus Torvalds Date: Thu, 23 Mar 2006 01:39:38 +0000 (-0800) Subject: scsi: link in the debug driver last X-Git-Tag: v3.12-rc1~37940 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0caab23e11c015559af81a4c0f4759ca05a5446a;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Randy Dunlap Acked-by: James Bottomley Signed-off-by: Linus Torvalds --- diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 15dc2e0..e513c31 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -117,7 +117,6 @@ obj-$(CONFIG_SCSI_PPA) += ppa.o obj-$(CONFIG_SCSI_IMM) += imm.o obj-$(CONFIG_JAZZ_ESP) += NCR53C9x.o jazz_esp.o obj-$(CONFIG_SUN3X_ESP) += NCR53C9x.o sun3x_esp.o -obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o obj-$(CONFIG_SCSI_FCAL) += fcal.o obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o obj-$(CONFIG_SCSI_NSP32) += nsp32.o @@ -148,6 +147,9 @@ obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o obj-$(CONFIG_CHR_DEV_SG) += sg.o obj-$(CONFIG_CHR_DEV_SCH) += ch.o +# This goes last, so that "real" scsi devices probe earlier +obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o + scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ scsicam.o scsi_error.o scsi_lib.o \ scsi_scan.o scsi_sysfs.o \