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/atmclip.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/atmclip.h')
| -rw-r--r-- | include/net/atmclip.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/atmclip.h b/include/net/atmclip.h index 467c531b8a7e..497ef6444a7a 100644 --- a/include/net/atmclip.h +++ b/include/net/atmclip.h | |||
| @@ -54,8 +54,6 @@ struct clip_priv { | |||
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | #ifdef __KERNEL__ | ||
| 58 | extern struct neigh_table *clip_tbl_hook; | 57 | extern struct neigh_table *clip_tbl_hook; |
| 59 | #endif | ||
| 60 | 58 | ||
| 61 | #endif | 59 | #endif |