sync kernel config, and disable broken ide driver until my CF card arrives

SVN-Revision: 12208

diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default
index d63e83ddf8be5266c38076220a5e2f147e7599c7..5456b9ba8e65ee8b048883bdb11887770f9a55e9 100644 (file)
--- a/target/linux/magicbox/config-default
+++ b/target/linux/magicbox/config-default
@@ -5,7 +5,6 @@ CONFIG_4xx=y
 # CONFIG_6xx is not set
 # CONFIG_8139TOO is not set
 # CONFIG_8xx is not set
-# CONFIG_ACCESSIBILITY is not set
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_AGP is not set
 CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -16,11 +15,10 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_BASE_SMALL=0
 CONFIG_BIOS_FIXUP=y
 CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_HD_ONLY is not set
 CONFIG_BLK_DEV_IDE=m
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDEDMA is not set
-CONFIG_BLK_DEV_MAGICBOX_IDE=y
+# CONFIG_BLK_DEV_MAGICBOX_IDE is not set
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x00400000
 CONFIG_BOUNCE=y
@@ -88,7 +86,6 @@ CONFIG_LZO_DECOMPRESS=m
 CONFIG_MAGICBOX=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEMSTICK is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_BLKDEVS=y
@@ -173,7 +170,6 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SERIAL_TEXT_DEBUG is not set
-CONFIG_SLABINFO=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set