[ppc40x] backport Magicbox CF driver to 2.6.28

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

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index fd69f81..bf506de 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -530,8 +530,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 # CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP_FIRMWARE is not set
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_HOSTAP_PLX is not set
@@ -722,7 +720,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
 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
@@ -792,6 +790,8 @@ CONFIG_IP_NF_SET_MAX=256
 # 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
@@ -1058,17 +1058,15 @@ CONFIG_MTD=y
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_TCINDEX is not set