[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

[openwrt.git] / target / linux / iop32x / config-default

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index 962b4a6..be0a64f 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -151,7 +151,6 @@ CONFIG_NET_DMA=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set

-# CONFIG_NEW_LEDS is not set

 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set


@@ -182,15 +181,11 @@ CONFIG_RTC_DRV_X1205=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

-# CONFIG_SHMEM is not set

 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set

-# CONFIG_SOUND is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set

-CONFIG_TINY_SHMEM=y
-# CONFIG_TUN is not set

 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set