update imq patches for 2.6.26, 2.6.27, 2.6.28, 2.6.29 and 2.6.30
[openwrt/staging/yousong.git] / target / linux / generic-2.6 / patches-2.6.29 / 180-netfilter_depends.patch
index cf402f53dc98bbfdd264b26ac25afc262e04518f..3694709ed1046289703d2192bd43db99ed5a59c2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
+@@ -160,7 +160,6 @@
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
@@ -8,7 +8,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -454,7 +453,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -466,7 +465,6 @@
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'