merge netfilter kernel changes to 2.6.26 as well

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

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 72ad1df..f7e28d9 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -781,6 +781,8 @@ CONFIG_MINIX_FS=m
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MINI_FO=y
 CONFIG_MISC_DEVICES=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_HFCPCI is not set
 CONFIG_MKISS=m
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
@@ -849,7 +851,6 @@ CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -859,17 +860,14 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DELUDE=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TARPIT=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1045,11 +1043,13 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_IXP4XX is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
@@ -1321,7 +1321,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is nost set
+# CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
@@ -1517,7 +1517,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SNI_RM is not set
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOC_CAMERA is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
@@ -1533,7 +1532,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_MIPS is not set
 # CONFIG_SSB_PCMCIAHOST is not set
+# CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y
@@ -1579,6 +1580,8 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_TEXTSEARCH_KMP=m
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THERMAL is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y
@@ -1784,7 +1787,6 @@ CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
-# CONFIG_USB_VIDEO_CLASS is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_VIDEO_CLASS is not set
 # CONFIG_USB_W9968CF is not set