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

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

diff --git a/target/linux/ixp4xx/config-2.6.30 b/target/linux/ixp4xx/config-2.6.30
index c5bdbcd..cf64c60 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.30
+++ b/target/linux/ixp4xx/config-2.6.30
@@ -22,8 +22,6 @@ CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y
 CONFIG_BOUNCE=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
@@ -40,8 +38,6 @@ CONFIG_CRC16=y
 # CONFIG_DCB is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
@@ -52,7 +48,6 @@ CONFIG_EEPROM_AT24=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_FREEZER is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
@@ -130,7 +125,6 @@ CONFIG_MACH_USR8200=y
 CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
-# CONFIG_MAC_PARTITION is not set
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
@@ -139,7 +133,6 @@ CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NET_SCH_DRR is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OUTER_CACHE is not set
@@ -149,7 +142,6 @@ CONFIG_PCI=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
 CONFIG_PHYLIB=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y