diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
| commit | f81b691a3df09806385ea413c3a2ee094c705ca3 (patch) | |
| tree | 01c0d6d319fcbddc98171d06cfe8e742cd270455 /include/linux/mroute6.h | |
| parent | 110e0358e7dfd9cc56d47077068f3680dae10b56 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/pat
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 | |||
| 115 | 115 | ||
| 116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
| 117 | 117 | ||
| 118 | #include <linux/pim.h> | ||
| 118 | #include <linux/skbuff.h> /* for struct sk_buff_head */ | 119 | #include <linux/skbuff.h> /* for struct sk_buff_head */ |
| 119 | 120 | ||
| 120 | #ifdef CONFIG_IPV6_MROUTE | 121 | #ifdef CONFIG_IPV6_MROUTE |