projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[cascardo/linux.git]
/
include
/
linux
/
mroute.h
diff --git
a/include/linux/mroute.h
b/include/linux/mroute.h
index
07112ee
..
8a45569
100644
(file)
--- a/
include/linux/mroute.h
+++ b/
include/linux/mroute.h
@@
-6,7
+6,6
@@
#ifdef __KERNEL__
#include <linux/in.h>
#endif
-#include <linux/pim.h>
/*
* Based on the MROUTING 3.5 defines primarily to keep
@@
-130,6
+129,7
@@
struct igmpmsg
*/
#ifdef __KERNEL__
+#include <linux/pim.h>
#include <net/sock.h>
#ifdef CONFIG_IP_MROUTE