diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /include/net/x25.h | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net/x25.h')
| -rw-r--r-- | include/net/x25.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 1479cb4a41fc..a06119a05129 100644 --- a/include/net/x25.h +++ b/include/net/x25.h | |||
| @@ -315,6 +315,8 @@ extern struct list_head x25_route_list; | |||
| 315 | extern rwlock_t x25_route_list_lock; | 315 | extern rwlock_t x25_route_list_lock; |
| 316 | extern struct list_head x25_forward_list; | 316 | extern struct list_head x25_forward_list; |
| 317 | extern rwlock_t x25_forward_list_lock; | 317 | extern rwlock_t x25_forward_list_lock; |
| 318 | extern struct list_head x25_neigh_list; | ||
| 319 | extern rwlock_t x25_neigh_list_lock; | ||
| 318 | 320 | ||
| 319 | extern int x25_proc_init(void); | 321 | extern int x25_proc_init(void); |
| 320 | extern void x25_proc_exit(void); | 322 | extern void x25_proc_exit(void); |