ar8216: rename the vlan attribute to enable_vlan to keep it consistent with other...

[openwrt.git] / target / linux / generic-2.6 / config-2.6.21

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index c7d1a20..07933f8 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -439,8 +439,8 @@ CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set

-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IKCONFIG is not set

 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y


@@ -529,7 +529,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set

-# CONFIG_IP_MROUTE is not set
+CONFIG_IP_MROUTE=y

 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set


@@ -602,6 +602,8 @@ CONFIG_IP_NF_TARGET_TCPMSS=y
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set

+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set

 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y