[kernel/f14/master] Re-enable I2O, but only for 32-bit x86 (#629676)

[Chuck Ebbert]

commit 44c4f071d9238f07851103008bd4589d9d8857cc
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Sep 3 05:23:00 2010 -0400

    Re-enable I2O, but only for 32-bit x86 (#629676)

 config-i686-PAE    |    3 +++
 config-x86-generic |   10 ++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/config-i686-PAE b/config-i686-PAE
index 1e58e65..eebaa6f 100644
--- a/config-i686-PAE
+++ b/config-i686-PAE
@@ -3,3 +3,6 @@ CONFIG_HIGHMEM64G=y
 
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
+
+# I2O only works on non-PAE 32-bit x86
+# CONFIG_I2O is not set
diff --git a/config-x86-generic b/config-x86-generic
index 58a8cf1..4f2f609 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -100,6 +100,16 @@ CONFIG_SECCOMP=y
 
 CONFIG_CAPI_EICON=y
 
+# I2O enabled only for 32-bit x86, disabled for PAE kernel
+CONFIG_I2O=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_I2O_CONFIG=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+
 #
 # APM (Advanced Power Management) BIOS Support
 #