diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:32:20 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:32:20 +0200 |
commit | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch) | |
tree | 6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /include/net/transp_v6.h | |
parent | efifb: fix int to pointer cast warning (diff) | |
parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
download | linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.xz linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/transp_v6.h')
-rw-r--r-- | include/net/transp_v6.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index a8122dc56410..5271a741c3a3 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h @@ -7,8 +7,6 @@ * IPv6 transport protocols */ -#ifdef __KERNEL__ - extern struct proto rawv6_prot; extern struct proto udpv6_prot; extern struct proto udplitev6_prot; @@ -57,5 +55,3 @@ extern const struct inet_connection_sock_af_ops ipv4_specific; extern void inet6_destroy_sock(struct sock *sk); #endif - -#endif |