aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-02 21:29:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-02 21:29:48 +0000
commit56571a75bc58ce55542fd1d989581933ec84c8c6 (patch)
treef22df421f71b50341ee8ae88a555d67d5e697986 /target/linux
parent46c4c356af0f3718496784baeba4b231da0d7d12 (diff)
downloadmaster-187ad058-56571a75bc58ce55542fd1d989581933ec84c8c6.tar.gz
master-187ad058-56571a75bc58ce55542fd1d989581933ec84c8c6.tar.bz2
master-187ad058-56571a75bc58ce55542fd1d989581933ec84c8c6.zip
[kernel] refresh 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13489 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
index c488a35d89..0937714134 100644
--- a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
@@ -1,7 +1,7 @@
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
-@@ -45,3 +45,14 @@
-
+@@ -45,3 +45,14 @@ header-y += ipt_ttl.h
+
unifdef-y += ip_queue.h
unifdef-y += ip_tables.h
+
diff --git a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
index 3d100d0439..94f1d19a7d 100644
--- a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h
header-y += nfnetlink_conntrack.h
header-y += nfnetlink_log.h
header-y += nfnetlink_queue.h