[x86] the olpc config that was merged from the olpc port is a 2.6.30 config

[openwrt.git] / target / linux / generic-2.6 / config-2.6.25

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 1c138f7..5be2b77 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -391,8 +391,8 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_FS is not set
-# CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB is not set
 # CONFIG_FB_PXA is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
@@ -805,12 +805,12 @@ CONFIG_MINI_FO=y
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_MKISS is not set
-# CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_BLOCK is not set
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_BLOCK is not set
 # CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set