diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 13:44:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 13:44:43 -0800 |
| commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
| tree | 90537ddf035e96ca3182f61755ed234de93b449b /net/ipv4/netfilter.c | |
| parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
| parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) | |
| download | olio-linux-3.10-58dc125a66145f45f239cd78db9410062dc0bcd4.tar.xz olio-linux-3.10-58dc125a66145f45f239cd78db9410062dc0bcd4.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/netfilter.c')
| -rw-r--r-- | net/ipv4/netfilter.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index 3321092b091..52a3d7c5790 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -1,16 +1,8 @@ /* IPv4 specific functions of netfilter core */ - -#include <linux/config.h> -#ifdef CONFIG_NETFILTER - #include <linux/kernel.h> #include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> - #include <linux/ip.h> -#include <linux/tcp.h> -#include <linux/udp.h> -#include <linux/icmp.h> #include <net/route.h> #include <net/xfrm.h> #include <net/ip.h> @@ -146,5 +138,3 @@ static void fini(void) module_init(init); module_exit(fini); - -#endif /* CONFIG_NETFILTER */ |