diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 23:06:00 -0700 |
| commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
| tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /include/linux/mroute.h | |
| parent | 143b11c03cd42f2284efe5128afc057d8fc86c78 (diff) | |
| parent | 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'include/linux/mroute.h')
| -rw-r--r-- | include/linux/mroute.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 07112ee9293a..8a455694d682 100644 --- 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 |