[PATCH] I2O subsystem fixing and cleanup for 2.6 - i2o-makefile-cleanup.patch

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

* The Kconfig and Makefile in drivers/message/i2o still got a CONFIG_I2O_PCI
  entry, which is not used anymore.  This one is replaced by a
  CONFIG_I2O_CONFIG entry, which now builds the i2o_config module.

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index 90b18e76cc9e6f940ce3fc2068cdf92fcf3621b2..8d132b0d6b1218d3dfc2360d54e4c631675e28e3 100644 (file)
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -3,7 +3,7 @@ menu "I2O device support"
 
 config I2O
        tristate "I2O support"
-       depends on PCI && !64BIT
+       depends on PCI
        ---help---
          The Intelligent Input/Output (I2O) architecture allows hardware
          drivers to be split into two parts: an operating system specific
@@ -20,19 +20,20 @@ config I2O
          drivers and OSM's with the following questions.
 
          To compile this support as a module, choose M here: the
-         modules will be called i2o_core and i2o_config.
+         modules will be called i2o_core.
 
          If unsure, say N.
 
-config I2O_PCI
-       tristate "I2O PCI support"
+config I2O_CONFIG
+       tristate "I2O Configuration support"
        depends on PCI && I2O
        help
-         Say Y for support of PCI bus I2O interface adapters. Currently this
-         is the only variety supported, so you should say Y.
+         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
+         raidutils to manage your RAID array, you have to say Y here.
 
          To compile this support as a module, choose M here: the
-         module will be called i2o_pci.
+         module will be called i2o_config.
 
 config I2O_BLOCK
        tristate "I2O Block OSM"

diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile
index 099e75f882c9d04ac698bf167eb5171db257c478..e3169dbd9520c57ef08e72024275d466f6c36ee1 100644 (file)
--- a/drivers/message/i2o/Makefile
+++ b/drivers/message/i2o/Makefile
@@ -5,7 +5,8 @@
 # In the future, some of these should be built conditionally.
 #
 
-obj-$(CONFIG_I2O)      += i2o_core.o i2o_config.o
+obj-$(CONFIG_I2O)      += i2o_core.o
+obj-$(CONFIG_I2O_CONFIG)+= i2o_config.o
 obj-$(CONFIG_I2O_BLOCK)        += i2o_block.o
 obj-$(CONFIG_I2O_SCSI) += i2o_scsi.o
 obj-$(CONFIG_I2O_PROC) += i2o_proc.o