diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/netfilter_ipv4/ip_conntrack.h | |
parent | [PATCH] s2io: netpoll support (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
download | linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/netfilter_ipv4/ip_conntrack.h')
-rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index e0e9951eb8c3..51dbec1892c8 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -4,7 +4,6 @@ #include <linux/netfilter/nf_conntrack_common.h> #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> #include <linux/bitops.h> #include <linux/compiler.h> |