kernel: refresh patches with kernel 2.6.37-rc7

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

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 689f404..a340ffc 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -1,6 +1,7 @@
 # CONFIG_8139TOO is not set
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_8139TOO is not set
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y

+# CONFIG_ARCH_CNS3XXX is not set

 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set


@@ -8,11 +9,13 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_S5P6440 is not set
 # CONFIG_ARCH_S5P6442 is not set
 CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_S5P6440 is not set
 # CONFIG_ARCH_S5P6442 is not set

+# CONFIG_ARCH_S5PC100 is not set

 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHMOBILE is not set
 CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHMOBILE is not set
 CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

+# CONFIG_ARCH_VEXPRESS is not set

 # CONFIG_ARM_THUMB is not set
 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARM_THUMB is not set
 CONFIG_ARM=y
 # CONFIG_ARPD is not set


@@ -30,6 +33,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


@@ -102,7 +106,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


@@ -194,6 +197,7 @@ CONFIG_PCI=y
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PLAT_ORION=y
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PLAT_ORION=y

+# CONFIG_PLAT_SPEAR is not set

 # CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
 # CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set