diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
| commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/250-netfilter_depends.patch | |
| parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
| download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/250-netfilter_depends.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/250-netfilter_depends.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/250-netfilter_depends.patch b/target/linux/generic/patches-3.6/250-netfilter_depends.patch index cbe3892316..f0c2275c0a 100644 --- a/target/linux/generic/patches-3.6/250-netfilter_depends.patch +++ b/target/linux/generic/patches-3.6/250-netfilter_depends.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -181,7 +181,6 @@ config NF_CONNTRACK_FTP +@@ -191,7 +191,6 @@ config NF_CONNTRACK_FTP 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 -@@ -627,7 +626,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -693,7 +692,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' |