Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[powerpc.git] / drivers / message / i2o / Kconfig

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index 06e8eb1..6443392 100644 (file)
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -24,6 +24,18 @@ config I2O
 
          If unsure, say N.
 
+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
+         firmware doesn't support LCT notification on changes. If this option
+         is enabled on such a controller the driver will hang up in a endless
+         loop. On all other controllers say Y.
+
+         If unsure, say Y.
+
 config I2O_EXT_ADAPTEC
        bool "Enable Adaptec extensions"
        depends on I2O
@@ -53,6 +65,9 @@ config I2O_CONFIG
          To compile this support as a module, choose M here: the
          module will be called i2o_config.
 
+         Note: If you want to use the new API you have to download the
+         i2o_config patch from http://i2o.shadowconnect.com/
+
 config I2O_CONFIG_OLD_IOCTL
        bool "Enable ioctls (OBSOLETE)"
        depends on I2O_CONFIG
@@ -73,7 +88,7 @@ config I2O_BUS
 
 config I2O_BLOCK
        tristate "I2O Block OSM"
-       depends on I2O
+       depends on I2O && 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