generic: move iptables/netfilter kernel options from generic/config to package/kernel...

[openwrt/svn-archive/archive.git] / target / linux / generic / config-2.6.34

diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34
index a1009acef92c47b460c696ede4982ae2145b6ced..3b58a1a1848082ec862259112875fd5de22dd494 100644 (file)
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@@ -79,6 +79,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
+# CONFIG_ARLAN is not set
 # CONFIG_ARM_UNWIND is not set
 CONFIG_ARPD=y
 # CONFIG_ARTHUR is not set
@@ -444,6 +445,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZLIB=y
 # CONFIG_CRYSTALHD 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
@@ -1014,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
@@ -1039,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
@@ -1058,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
@@ -1204,6 +1206,7 @@ CONFIG_LBDAF=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
@@ -1261,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
@@ -1469,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
@@ -1529,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
@@ -1578,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
@@ -1586,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
@@ -1607,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
@@ -1672,6 +1675,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
+# CONFIG_NO_BOOTMEM is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_NORTEL_HERMES is not set
@@ -2782,6 +2786,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VETH is not set
 # CONFIG_VFAT_FS is not set
 # CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
@@ -2879,6 +2884,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
@@ -2905,6 +2911,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_WANXL is not set
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG=y
+# CONFIG_WAVELAN is not set
 # CONFIG_WDTPCI is not set
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS_EXT_SYSFS=y