git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /repos/git/net-next-2.6
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
nf_conntrack_proto.c
diff --git
a/net/netfilter/nf_conntrack_proto.c
b/net/netfilter/nf_conntrack_proto.c
index
f71cd5d
..
a6defc7
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto.c
+++ b/
net/netfilter/nf_conntrack_proto.c
@@
-12,6
+12,7
@@
#include <linux/types.h>
#include <linux/netfilter.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/vmalloc.h>
#include <linux/stddef.h>