[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 0082e4e..5be2b77 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -393,10 +393,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_FS 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
 CONFIG_FIB_RULES=y
 # CONFIG_FIREWIRE is not set
+# CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
@@ -609,7 +611,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_IP_MROUTE is not set
+CONFIG_IP_MROUTE=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set
@@ -679,6 +681,8 @@ CONFIG_IP_NF_SET_MAX=256
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
@@ -802,7 +806,12 @@ CONFIG_MINI_FO=y
 CONFIG_MISC_DEVICES=y
 # CONFIG_MKISS is not set
 # CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AT91 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
 # CONFIG_MODULE_SRCVERSION_ALL is not set
@@ -1875,6 +1884,7 @@ CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set