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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
netfilter.h
diff --git
a/include/linux/netfilter.h
b/include/linux/netfilter.h
index
e4c6659
..
0c5eb7e
100644
(file)
--- a/
include/linux/netfilter.h
+++ b/
include/linux/netfilter.h
@@
-3,7
+3,6
@@
#ifdef __KERNEL__
#include <linux/init.h>
#ifdef __KERNEL__
#include <linux/init.h>
-#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/net.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/net.h>
#include <linux/netdevice.h>
@@
-14,6
+13,7
@@
#include <linux/list.h>
#include <net/net_namespace.h>
#endif
#include <linux/list.h>
#include <net/net_namespace.h>
#endif
+#include <linux/types.h>
#include <linux/compiler.h>
/* Responses from hook functions. */
#include <linux/compiler.h>
/* Responses from hook functions. */