Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

1 files changed, 2 insertions, 1 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index f1e5af4be98e..a0ed93672176 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -17,6 +17,8 @@
 
 #define IPV6_MAX_ADDRESSES              16
 
+#include <linux/in6.h>
+
 struct prefix_info {
         __u8                    type;
         __u8                    length;
@@ -43,7 +45,6 @@ struct prefix_info {
 
 #ifdef __KERNEL__
 
-#include <linux/in6.h>
 #include <linux/netdevice.h>
 #include <net/if_inet6.h>
 #include <net/ipv6.h>