Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / include / net / mip6.h

diff --git a/include/net/mip6.h b/include/net/mip6.h
index fd43178faace15625296dd5852decf42c1c6f8f0..63272610a24a4cd3c9f32951c78174189d5d3529 100644 (file)
--- a/include/net/mip6.h
+++ b/include/net/mip6.h
@@ -25,6 +25,9 @@
 #ifndef _NET_MIP6_H
 #define _NET_MIP6_H
 
+#include <linux/skbuff.h>
+#include <net/sock.h>
+
 #define MIP6_OPT_PAD_1 0
 #define MIP6_OPT_PAD_N 1
 
@@ -51,7 +54,4 @@ struct ip6_mh {
 #define IP6_MH_TYPE_BERROR     7   /* Binding Error */
 #define IP6_MH_TYPE_MAX                IP6_MH_TYPE_BERROR
 
-extern int mip6_init(void);
-extern void mip6_fini(void);
-
 #endif