diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/net/rawv6.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/net/rawv6.h')
| -rw-r--r-- | include/net/rawv6.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/rawv6.h b/include/net/rawv6.h index f6b9b830df8c..cf7577234457 100644 --- a/include/net/rawv6.h +++ b/include/net/rawv6.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _NET_RAWV6_H | 1 | #ifndef _NET_RAWV6_H |
| 2 | #define _NET_RAWV6_H | 2 | #define _NET_RAWV6_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <net/protocol.h> | 4 | #include <net/protocol.h> |
| 7 | 5 | ||
| 8 | void raw6_icmp_error(struct sk_buff *, int nexthdr, | 6 | void raw6_icmp_error(struct sk_buff *, int nexthdr, |
| @@ -20,5 +18,3 @@ int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock, | |||
| 20 | #endif | 18 | #endif |
| 21 | 19 | ||
| 22 | #endif | 20 | #endif |
| 23 | |||
| 24 | #endif | ||