aboutsummaryrefslogtreecommitdiffstats
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
commitd4b1e5aee2e89e1778ef6723c13622f5e5a9f17a (patch)
tree8bd2f978b74421e9ae3bc58f3c99da11b0019679
parent7322a7236ba9f0249158dfa6bad84ed07a60e4de (diff)
downloadupstream-d4b1e5aee2e89e1778ef6723c13622f5e5a9f17a.tar.gz
upstream-d4b1e5aee2e89e1778ef6723c13622f5e5a9f17a.tar.bz2
upstream-d4b1e5aee2e89e1778ef6723c13622f5e5a9f17a.zip
[magicbox] sync kernel config, and disable broken ide driver until my CF card arrives
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12208 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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