Skip to contentSkip to conversation

Config bugfix - Move MPT fusion into SCSi menu

PATCH New Rob Landley 1 participant 1 message Aug 1, 2003

Subsystems (3)
SCSI PA-RISC architecture Alpha port
lore
Share & tools
lore

Rob Landley

author
#0 lore raw

PATCH 1/1 Config bugfix - Move MPT fusion into SCSi menu

MPT fusion is a SCSI driver. If you go into the SCSI menu and disable SCSI support, you can't descend into this driver's menu (and there's no easy way to find out why). A random SCSI driver more than 90% of the people out there don't have doesn't belong at the top level anyway.

Unfortunately, since this IS at the top level, every architecture in the world imports this from their arch/blah/Kconfig (in two cases guarded by CONFIG_PCI), so the patch is unnecessarily big removing it from a lot of places and adding it to the one it goes in. Hopefully, it's still in the "trivial" range anyway, so I'm copying Rusty.

I bugged the two architecture maintainers who used the PCI guard when I first submitted this patch back under 2.4, and I have a vague memory that they said moving it to the SCSI menu provided its own PCI guard, but my memory's been wrong before, so I'm copying Dave Miller (sparc64) and Richard Henderson (alpha) in case they'd like to bite my head off...

It's quite possible that it should go in the "SCSI low level device drivers" menu instead of the SCSI menu, but nothing else in the SCSI devices menu has its own gratuitous sub-menu, and that cleanup is real easy to do on top of this one anyway.

Rob

Patch against -test2.

arch/alpha/Kconfig +0 -4
diff -ru linux-old/arch/alpha/Kconfig linux-2.6.0-test2/arch/alpha/Kconfig
@@ -656,10 +656,6 @@
 
 source "drivers/scsi/Kconfig"
 
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
 source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
arch/i386/Kconfig +0 -2
diff -ru linux-old/arch/i386/Kconfig linux-2.6.0-test2/arch/i386/Kconfig
@@ -1212,8 +1212,6 @@
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
arch/ia64/Kconfig +0 -2
diff -ru linux-old/arch/ia64/Kconfig linux-2.6.0-test2/arch/ia64/Kconfig
@@ -552,8 +552,6 @@
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 endif
arch/m68knommu/Kconfig +0 -2
diff -ru linux-old/arch/m68knommu/Kconfig linux-2.6.0-test2/arch/m68knommu/Kconfig
@@ -530,8 +530,6 @@
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
arch/parisc/Kconfig +0 -2
diff -ru linux-old/arch/parisc/Kconfig linux-2.6.0-test2/arch/parisc/Kconfig
@@ -186,8 +186,6 @@
 
 source "drivers/md/Kconfig"
 
-#source drivers/message/fusion/Kconfig
-
 #source drivers/ieee1394/Kconfig
 
 #source drivers/message/i2o/Kconfig
arch/ppc/Kconfig +0 -2
diff -ru linux-old/arch/ppc/Kconfig linux-2.6.0-test2/arch/ppc/Kconfig
@@ -1176,8 +1176,6 @@
 
 source "drivers/scsi/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
arch/ppc64/Kconfig +0 -2
diff -ru linux-old/arch/ppc64/Kconfig linux-2.6.0-test2/arch/ppc64/Kconfig
@@ -257,8 +257,6 @@
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
arch/sparc64/Kconfig +0 -4
diff -ru linux-old/arch/sparc64/Kconfig linux-2.6.0-test2/arch/sparc64/Kconfig
@@ -676,10 +676,6 @@
 
 source "drivers/fc4/Kconfig"
 
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
 source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
arch/v850/Kconfig +0 -2
diff -ru linux-old/arch/v850/Kconfig linux-2.6.0-test2/arch/v850/Kconfig
@@ -301,8 +301,6 @@
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
arch/x86_64/Kconfig +0 -2
diff -ru linux-old/arch/x86_64/Kconfig linux-2.6.0-test2/arch/x86_64/Kconfig
@@ -413,8 +413,6 @@
 
 source "drivers/telephony/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 #Currently not 64-bit safe
drivers/scsi/Kconfig +1 -0
diff -ru linux-old/drivers/scsi/Kconfig linux-2.6.0-test2/drivers/scsi/Kconfig
@@ -1836,6 +1836,7 @@
 #      bool 'GVP Turbo 040/060 SCSI support (EXPERIMENTAL)' CONFIG_GVP_TURBO_SCSI
 endmenu
 
+source "drivers/message/fusion/Kconfig"
 source "drivers/scsi/pcmcia/Kconfig"
 
 endmenu