Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / drivers / message / i2o / Kconfig

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index fef6771..5afa0e3 100644 (file)
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -1,8 +1,6 @@
 
-menu "I2O device support"
-
-config I2O
-       tristate "I2O support"
+menuconfig I2O
+       tristate "I2O device support"
        depends on PCI
        ---help---
          The Intelligent Input/Output (I2O) architecture allows hardware
@@ -24,9 +22,10 @@ config I2O
 
          If unsure, say N.
 
+if I2O
+
 config I2O_LCT_NOTIFY_ON_CHANGES
        bool "Enable LCT notification"
-       depends on I2O
        default y
        ---help---
          Only say N here if you have a I2O controller from SUN. The SUN
@@ -38,7 +37,6 @@ config I2O_LCT_NOTIFY_ON_CHANGES
 
 config I2O_EXT_ADAPTEC
        bool "Enable Adaptec extensions"
-       depends on I2O
        default y
        ---help---
          Say Y for support of raidutils for Adaptec I2O controllers. You also
@@ -56,7 +54,7 @@ config I2O_EXT_ADAPTEC_DMA64
 
 config I2O_CONFIG
        tristate "I2O Configuration support"
-       depends on I2O
+       depends on VIRT_TO_BUS
        ---help---
          Say Y for support of the configuration interface for the I2O adapters.
          If you have a RAID controller from Adaptec and you want to use the
@@ -77,7 +75,6 @@ config I2O_CONFIG_OLD_IOCTL
 
 config I2O_BUS
        tristate "I2O Bus Adapter OSM"
-       depends on I2O
        ---help---
          Include support for the I2O Bus Adapter OSM. The Bus Adapter OSM
          provides access to the busses on the I2O controller. The main purpose
@@ -88,7 +85,7 @@ config I2O_BUS
 
 config I2O_BLOCK
        tristate "I2O Block OSM"
-       depends on I2O
+       depends on BLOCK
        ---help---
          Include support for the I2O Block OSM. The Block OSM presents disk
          and other structured block devices to the operating system. If you
@@ -101,7 +98,7 @@ config I2O_BLOCK
 
 config I2O_SCSI
        tristate "I2O SCSI OSM"
-       depends on I2O && SCSI
+       depends on SCSI
        ---help---
          Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
          I2O controller. You can use both the SCSI and Block OSM together if
@@ -113,7 +110,6 @@ config I2O_SCSI
 
 config I2O_PROC
        tristate "I2O /proc support"
-       depends on I2O
        ---help---
          If you say Y here and to "/proc file system support", you will be
          able to read I2O related information from the virtual directory
@@ -122,5 +118,4 @@ config I2O_PROC
          To compile this support as a module, choose M here: the
          module will be called i2o_proc.
 
-endmenu
-
+endif # I2O