diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /include/linux/mroute.h | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
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 @@ | |||
| 6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 7 | #include <linux/in.h> | 7 | #include <linux/in.h> |
| 8 | #endif | 8 | #endif |
| 9 | #include <linux/pim.h> | ||
| 10 | 9 | ||
| 11 | /* | 10 | /* |
| 12 | * Based on the MROUTING 3.5 defines primarily to keep | 11 | * Based on the MROUTING 3.5 defines primarily to keep |
| @@ -130,6 +129,7 @@ struct igmpmsg | |||
| 130 | */ | 129 | */ |
| 131 | 130 | ||
| 132 | #ifdef __KERNEL__ | 131 | #ifdef __KERNEL__ |
| 132 | #include <linux/pim.h> | ||
| 133 | #include <net/sock.h> | 133 | #include <net/sock.h> |
| 134 | 134 | ||
| 135 | #ifdef CONFIG_IP_MROUTE | 135 | #ifdef CONFIG_IP_MROUTE |