From ffcfd3fb76ada570ba888895777276a9904de324 Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Fri, 3 Sep 2010 05:23:00 -0400 Subject: [PATCH] Re-enable I2O, but only for 32-bit x86 (#629676) --- config-i686-PAE | 3 +++ config-x86-generic | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/config-i686-PAE b/config-i686-PAE index 1e58e65b2..eebaa6fba 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 9179350a4..78e82b5a8 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 #