diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
| commit | 097916ecafd3bbedbde3ba068522093bf72319b3 (patch) | |
| tree | 95b8f52826883ccb04086725f0b94186adc1566f /net/tipc/node_subscr.h | |
| parent | 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff) | |
| parent | 29f8f63272bd286549d1c7f75ad22686191d35d8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/tipc/node_subscr.h')
| -rw-r--r-- | net/tipc/node_subscr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/node_subscr.h b/net/tipc/node_subscr.h index a3b87ac4859b..01751c4fbb43 100644 --- a/net/tipc/node_subscr.h +++ b/net/tipc/node_subscr.h @@ -56,8 +56,8 @@ struct node_subscr { struct list_head nodesub_list; }; -void nodesub_subscribe(struct node_subscr *node_sub, u32 addr, - void *usr_handle, net_ev_handler handle_down); -void nodesub_unsubscribe(struct node_subscr *node_sub); +void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, + void *usr_handle, net_ev_handler handle_down); +void tipc_nodesub_unsubscribe(struct node_subscr *node_sub); #endif |