diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-02 19:27:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-02 19:27:43 -0700 |
| commit | 2351392f27542a8774b41fe7a227a08900d8e52d (patch) | |
| tree | 09544cfcf95b01f941d3c901b35d0048d4b36d31 /include/linux | |
| parent | 83d6ea2d99337beb2d9fd31767bc31f585640ad5 (diff) | |
| parent | 7cd101a51b34e2cfe1f93543937a54f0dadc2cc2 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack_ftp.h | 5 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack_irc.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_ftp.h b/include/linux/netfilter_ipv4/ip_conntrack_ftp.h index 677db49e26fb..2f85006c75f9 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack_ftp.h +++ b/include/linux/netfilter_ipv4/ip_conntrack_ftp.h @@ -4,11 +4,6 @@ #ifdef __KERNEL__ -#include <linux/netfilter_ipv4/lockhelp.h> - -/* Protects ftp part of conntracks */ -DECLARE_LOCK_EXTERN(ip_ftp_lock); - #define FTP_PORT 21 #endif /* __KERNEL__ */ diff --git a/include/linux/netfilter_ipv4/ip_conntrack_irc.h b/include/linux/netfilter_ipv4/ip_conntrack_irc.h index 170248fa87bd..0cd24a02d360 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack_irc.h +++ b/include/linux/netfilter_ipv4/ip_conntrack_irc.h @@ -33,13 +33,8 @@ struct ip_ct_irc_master { #ifdef __KERNEL__ -#include <linux/netfilter_ipv4/lockhelp.h> - #define IRC_PORT 6667 -/* Protects irc part of conntracks */ -DECLARE_LOCK_EXTERN(ip_irc_lock); - #endif /* __KERNEL__ */ #endif /* _IP_CONNTRACK_IRC_H */ |