diff --git a/config-i686-PAE b/config-i686-PAE
index 429853e32..fdc8a8bd4 100644
--- a/config-i686-PAE
+++ b/config-i686-PAE
@@ -4,3 +4,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 5f14f346a..9b80da7ff 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
 #