X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-2.6.34;h=d08c34448ee251ba0e15a7af411fd413cea5586b;hb=14d155196f66542c7b91aece78bc0eac5e2f017f;hp=c396edf518f56ff1da18e4585de1cb67a607727c;hpb=f1989e56bd817ad755de4d8d1d759e2be9ca2fa9;p=openwrt.git

diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34
index c396edf518..d08c34448e 100644
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@@ -444,8 +444,8 @@ CONFIG_CRYPTO_UNLZMA=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZLIB=y
 # CONFIG_CRYSTALHD is not set
-# CONFIG_CS5535_MFGPT is not set
 # CONFIG_CUSE is not set
+# CONFIG_CS5535_MFGPT is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
@@ -1016,9 +1016,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
@@ -1041,18 +1041,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
@@ -1060,7 +1060,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
@@ -1264,7 +1264,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MACVTAP 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
@@ -1472,7 +1472,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
@@ -1532,7 +1532,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
@@ -1581,7 +1581,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
@@ -1589,14 +1589,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
@@ -1610,7 +1610,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
@@ -1858,6 +1858,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
@@ -2884,6 +2885,7 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMXNET3 is not set
+# CONFIG_VMWARE_BALLOON is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_VT is not set