diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 03:48:57 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 03:48:57 -0400 |
commit | 2fcf522509cceea524b6e7ece8fd6759b682175a (patch) | |
tree | d356e87307e451cce5497ad8daeeeb047befe489 /net/unix/af_unix.c | |
parent | da61396d24e37258817e42537c482e962b4742f7 (diff) | |
parent | 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (diff) |
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index d403e34088ad..41feca3bef86 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -105,7 +105,7 @@ #include <linux/skbuff.h> #include <linux/netdevice.h> #include <net/sock.h> -#include <linux/tcp.h> +#include <net/tcp_states.h> #include <net/af_unix.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -2026,14 +2026,6 @@ static struct net_proto_family unix_family_ops = { .owner = THIS_MODULE, }; -#ifdef CONFIG_SYSCTL -extern void unix_sysctl_register(void); -extern void unix_sysctl_unregister(void); -#else -static inline void unix_sysctl_register(void) {} -static inline void unix_sysctl_unregister(void) {} -#endif - static int __init af_unix_init(void) { int rc = -1; |