Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / include / linux / mroute.h

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c41b4217ae3bfe9b15fc4e4e2134a6fb924b0b27..de4decfa1bfc7a9ef0f0f3399055b34f33fd73f7 100644 (file)
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,10 @@
 #define __LINUX_MROUTE_H
 
 #include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
 #include <linux/in.h>
+#endif
 #include <linux/pim.h>
 
 /*