diff options
author | David S. Miller | 2008-08-30 08:06:00 +0200 |
---|---|---|
committer | David S. Miller | 2008-08-30 08:06:00 +0200 |
commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /include/linux/mroute6.h | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | net: Unbreak userspace usage of linux/mroute.h (diff) | |
download | kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.tar.gz kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.tar.xz kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.zip |
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/mroute6.h')
-rw-r--r-- | include/linux/mroute6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 5cf50473a10f..6f4c180179e2 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -115,6 +115,7 @@ struct sioc_mif_req6 #ifdef __KERNEL__ +#include <linux/pim.h> #include <linux/skbuff.h> /* for struct sk_buff_head */ #ifdef CONFIG_IPV6_MROUTE |