summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-08-06 13:34:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-06 13:34:45 +0000
commit39190275d4cf1cbacea389f18da6667d0d337ccc (patch)
tree66895491adc8e0edf86213841391efc4aada725e
parent311c9403d9d4041bb4e6b9946d818834c57469f2 (diff)
downloadmaster-31e0f0ae-39190275d4cf1cbacea389f18da6667d0d337ccc.tar.gz
master-31e0f0ae-39190275d4cf1cbacea389f18da6667d0d337ccc.tar.bz2
master-31e0f0ae-39190275d4cf1cbacea389f18da6667d0d337ccc.zip
sync kernel config, and disable broken ide driver until my CF card arrives
SVN-Revision: 12208
-rw-r--r--target/linux/magicbox/config-default6
1 files changed, 1 insertions, 5 deletions
diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default
index d63e83ddf8..5456b9ba8e 100644
--- 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