ramips: add error-path handling to the ramips_eth_plat_probe

[openwrt.git] / target / linux / olpc / config-2.6.30

diff --git a/target/linux/olpc/config-2.6.30 b/target/linux/olpc/config-2.6.30
index 5bedbb5..f4f32e0 100644 (file)
--- a/target/linux/olpc/config-2.6.30
+++ b/target/linux/olpc/config-2.6.30
@@ -67,7 +67,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_BOUNCE=y
 CONFIG_CAN_PM_TRACE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_BOUNCE=y
 CONFIG_CAN_PM_TRACE=y
 # CONFIG_CC_STACKPROTECTOR is not set

-CONFIG_CFG80211=y

 CONFIG_CHR_DEV_SG=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_CHR_DEV_SG=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_CMDLINE_BOOL is not set


@@ -319,13 +318,7 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI=y

-# CONFIG_MMC_SDHCI_PCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_WBSD is not set

 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y