kernel: refresh patches with 2.6.34-rc4

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.34 / 190-netfilter_rtsp.patch

diff --git a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
index 29e82084ca71771078f0d24454b5ce9b6c850af8..68792936bb301286861099b59089df4526829aa8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
@@ -304,7 +304,7 @@
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
+@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP
  
          To compile it as a module, choose M here.  If unsure, say N.