upgrade iop32x to 2.6.30

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

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 93329e3..c3ad33a 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -54,7 +54,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0

-# CONFIG_BATTERY_DS2760 is not set

 CONFIG_BATTERY_OLPC=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y


@@ -69,7 +68,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOUNCE=y
 CONFIG_CAN_PM_TRACE=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOUNCE=y
 CONFIG_CAN_PM_TRACE=y

-CONFIG_CFG80211=y

 CONFIG_CHR_DEV_SG=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y


@@ -315,13 +313,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=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


@@ -392,7 +384,6 @@ CONFIG_MTD_PCI=y
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_SIP is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_SIP is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set

-CONFIG_NL80211=y

 # CONFIG_NLS is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_HZ=y
 # CONFIG_NLS is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_HZ=y


@@ -477,10 +468,7 @@ CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_INTEL is not set
 # CONFIG_SND_HDA_POWER_SAVE is not set
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_INTEL is not set
 # CONFIG_SND_HDA_POWER_SAVE is not set

-# CONFIG_SND_MIXER_OSS is not set

 CONFIG_SND_PCI=y
 CONFIG_SND_PCI=y

-# CONFIG_SND_PCSP is not set
-# CONFIG_SND_SIS7019 is not set

 # CONFIG_SND_USB is not set
 CONFIG_SND_VMASTER=y
 # CONFIG_SONYPI is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_VMASTER=y
 # CONFIG_SONYPI is not set