linux/atheros: fix another 2.6.36 patch issue

[openwrt.git] / target / linux / generic / config-2.6.33

diff --git a/target/linux/generic/config-2.6.33 b/target/linux/generic/config-2.6.33
index d39dd6f..30027e6 100644 (file)
--- a/target/linux/generic/config-2.6.33
+++ b/target/linux/generic/config-2.6.33
@@ -994,9 +994,9 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARP_MANGLE is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CONNTRACK_MARK  is not set
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CT_ACCT is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_FILTER is not set
 # CONFIG_IP_NF_FTP is not set
@@ -1019,18 +1019,18 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_NAT_FTP is not set
 # CONFIG_IP_NF_NAT_H323 is not set
 # CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_NEEDED is not set
 # CONFIG_IP_NF_NAT_PPTP is not set
 # CONFIG_IP_NF_NAT_SIP is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NAT is not set
 # CONFIG_IP_NF_NETBIOS_NS is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_HASHSIZE is not set
 # CONFIG_IP_NF_SET_IPHASH is not set
 # CONFIG_IP_NF_SET_IPMAP is not set
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
@@ -1038,7 +1038,7 @@ CONFIG_IP_NF_SET_HASHSIZE=1024
 # CONFIG_IP_NF_SET_IPTREEMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_MAX is not set
 # CONFIG_IP_NF_SET_NETHASH is not set
 # CONFIG_IP_NF_SET_PORTMAP is not set
 # CONFIG_IP_NF_SIP is not set
@@ -1150,6 +1150,7 @@ CONFIG_JFFS2_LZMA=y
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_JME is not set
 CONFIG_JOLIET=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KARMA_PARTITION is not set
@@ -1235,7 +1236,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MARKEINS is not set
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
@@ -1437,7 +1438,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
@@ -1497,7 +1498,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
 CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
@@ -1546,7 +1547,7 @@ CONFIG_NET=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_FTP is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -1554,14 +1555,14 @@ CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IRC is not set
 # CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_SUPPORT is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
@@ -1575,7 +1576,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set
@@ -1823,6 +1824,7 @@ CONFIG_PROC_KCORE=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_PSB6970_PHY is not set
 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set
@@ -2418,6 +2420,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIMERFD=y
 # CONFIG_TINY_SHMEM is not set
 # CONFIG_TIPC is not set