summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-09-11 11:22:47 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-09-11 11:22:47 +0200
commit17d954a793b8a275324e5941a9515b991c80789d (patch)
treed2ae1d77b40eeb94a3e5ff24b6ac9a4b1df00cdf
parent91d4031f78382a4cd5cf8666c7f985e2728e8578 (diff)
Include linux/jiffies.h for kernel 2.6.20 (Jan Engelhardt)
-rw-r--r--kernel/ChangeLog3
-rw-r--r--kernel/ip_set_iptree.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index f0c3616..849e98e 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,6 @@
+ - Compilation of ip_set_iptree.c fails with kernel 2.6.20 due to
+ missing include of linux/jiffies.h (Jan Engelhardt)
+
3.2
- Mixed up formats in ip_set_iptree.c (Rob Sterenborg)
- Don't use 'bool' for backward compatibility reasons (Rob Sterenborg)
diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c
index 1ef8263..cdb3404 100644
--- a/kernel/ip_set_iptree.c
+++ b/kernel/ip_set_iptree.c
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/ip.h>
+#include <linux/jiffies.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
#include <linux/delay.h>