commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / defconfig

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 8cae61a..d745788 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -19,6 +19,8 @@ CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+CONFIG_IKCONFIG=n
+CONFIG_IKCONFIG_PROC=n
 
 #
 # Loadable module support
@@ -253,7 +255,6 @@ CONFIG_BLK_DEV_ADMA=y
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_NFORCE is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -268,7 +269,6 @@ CONFIG_BLK_DEV_RZ1000=y
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_BLK_DEV_IDE_MODES=y
 
 #
 # SCSI device support