update configs for advanced iprouter

xcaliburinhand · Jan 4, 2012 · 4870b83 · 4870b83
1 parent c053538
commit 4870b83
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/arch/arm/configs/aries_captivatemtd_defconfig b/arch/arm/configs/aries_captivatemtd_defconfig
@@ -545,7 +545,11 @@ CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+# CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set

diff --git a/arch/arm/configs/aries_galaxysbmtd_defconfig b/arch/arm/configs/aries_galaxysbmtd_defconfig
@@ -339,7 +339,6 @@ CONFIG_S5P_ADC=y
 CONFIG_S5PV210_SETUP_FIMC0=y
 CONFIG_S5PV210_SETUP_FIMC1=y
 CONFIG_S5PV210_SETUP_FIMC2=y
-CONFIG_S5PV210_SETUP_CSIS=y
 # CONFIG_DVFS_LIMIT is not set
 CONFIG_CPU_DIDLE=y
 CONFIG_WIFI_CONTROL_FUNC=y

diff --git a/arch/arm/configs/aries_galaxysmtd_defconfig b/arch/arm/configs/aries_galaxysmtd_defconfig
@@ -340,6 +340,7 @@ CONFIG_S5P_ADC=y
 CONFIG_S5PV210_SETUP_FIMC0=y
 CONFIG_S5PV210_SETUP_FIMC1=y
 CONFIG_S5PV210_SETUP_FIMC2=y
+CONFIG_S5PV210_SETUP_CSIS=y
 # CONFIG_DVFS_LIMIT is not set
 CONFIG_CPU_DIDLE=y
 CONFIG_WIFI_CONTROL_FUNC=y
@@ -544,7 +545,11 @@ CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+# CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set

diff --git a/arch/arm/configs/aries_vibrantmtd_defconfig b/arch/arm/configs/aries_vibrantmtd_defconfig
@@ -340,7 +340,6 @@ CONFIG_S5P_ADC=y
 CONFIG_S5PV210_SETUP_FIMC0=y
 CONFIG_S5PV210_SETUP_FIMC1=y
 CONFIG_S5PV210_SETUP_FIMC2=y
-CONFIG_S5PV210_SETUP_CSIS=y
 # CONFIG_DVFS_LIMIT is not set
 CONFIG_CPU_DIDLE=y
 CONFIG_WIFI_CONTROL_FUNC=y