diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 10:37:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 10:37:06 -0800 |
commit | 9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch) | |
tree | 02d18c920a03a600e915d66d6a471d900857b3ac /net/ipv4/ipvs/ip_vs_lblcr.c | |
parent | 12472b4165a21f5415ff4f60f8f46311a6b7b9ac (diff) | |
parent | f23f6e08c47acbdd20e9c49a79da8c404ea168e1 (diff) | |
download | kernel_goldelico_gta04-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.zip kernel_goldelico_gta04-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.gz kernel_goldelico_gta04-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.bz2 |
Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird
* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird:
[PATCH] severing poll.h -> mm.h
[PATCH] severing skbuff.h -> mm.h
[PATCH] severing skbuff.h -> poll.h
[PATCH] severing skbuff.h -> highmem.h
[PATCH] severing uaccess.h -> sched.h
[PATCH] severing fs.h, radix-tree.h -> sched.h
[PATCH] severing module.h->sched.h
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_lblcr.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_lblcr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c index 0899019..fe1af5d 100644 --- a/net/ipv4/ipvs/ip_vs_lblcr.c +++ b/net/ipv4/ipvs/ip_vs_lblcr.c @@ -43,6 +43,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/skbuff.h> +#include <linux/jiffies.h> /* for sysctl */ #include <linux/fs.h> |