sync kernel config

SVN-Revision: 12140

diff --git a/target/linux/adm5120/router_be/config-default b/target/linux/adm5120/router_be/config-default
index b61be5cfef1f86328882947f6021476a2cac7905..e14bb867d3835d9fabd0488cd43b8f801ad40267 100644 (file)
--- a/target/linux/adm5120/router_be/config-default
+++ b/target/linux/adm5120/router_be/config-default
@@ -190,6 +190,7 @@ CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NO_IOPORT is not set
+# CONFIG_OCF_OCF is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -239,6 +240,7 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SSB_POSSIBLE=y
+CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y

diff --git a/target/linux/adm5120/router_le/config-default b/target/linux/adm5120/router_le/config-default
index 25ca729b1fa0ad7e9f5dda9bd40a402a0cdbcd9f..b7961d519ab7eee413deae67094b3fd66fafb21f 100644 (file)
--- a/target/linux/adm5120/router_le/config-default
+++ b/target/linux/adm5120/router_le/config-default
@@ -201,6 +201,7 @@ CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NO_IOPORT is not set
+# CONFIG_OCF_OCF is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set