kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches...

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

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index d84cac1..c78a397 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -1,5 +1,3 @@
-# CONFIG_8139TOO is not set
-# CONFIG_AEABI is not set

 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set


@@ -25,6 +23,7 @@ CONFIG_BOUNCE=y
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"

+CONFIG_CMDLINE_FORCE=y

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_32=y
 CONFIG_CPU_ABRT_EV5T=y


@@ -38,7 +37,6 @@ CONFIG_CPU_FEROCEON=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y

-CONFIG_CRC16=y

 # CONFIG_CRC_CCITT is not set
 CONFIG_CRYPTO_DEV_MV_CESA=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRYPTO_DEV_MV_CESA=y
 CONFIG_CRYPTO_HW=y


@@ -98,7 +96,6 @@ CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set

-# CONFIG_IP_ADVANCED_ROUTER is not set

 CONFIG_IP_MROUTE=y
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set


@@ -132,6 +129,8 @@ CONFIG_LZO_DECOMPRESS=m
 CONFIG_MACH_DT2=y
 # CONFIG_MACH_EDMINI_V2 is not set
 # CONFIG_MACH_KUROBOX_PRO is not set
 CONFIG_MACH_DT2=y
 # CONFIG_MACH_EDMINI_V2 is not set
 # CONFIG_MACH_KUROBOX_PRO is not set

+# CONFIG_MACH_LINKSTATION_LS_HGL is not set
+# CONFIG_MACH_LINKSTATION_LSCHL is not set

 # CONFIG_MACH_LINKSTATION_MINI is not set
 # CONFIG_MACH_LINKSTATION_PRO is not set
 # CONFIG_MACH_MSS2 is not set
 # CONFIG_MACH_LINKSTATION_MINI is not set
 # CONFIG_MACH_LINKSTATION_PRO is not set
 # CONFIG_MACH_MSS2 is not set


@@ -179,7 +178,6 @@ CONFIG_NET_DSA=y
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set

-# CONFIG_OABI_COMPAT is not set

 # CONFIG_ORION5X_WATCHDOG is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_ORION5X_WATCHDOG is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y