Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 15dc2e00e1b26a0ab1439e68fddc4d9037d8b8bb..e513c3158ad90ea7ecc5eef8cea0da146bbc11d6 100644 (file)
--- 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 \