diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:06:09 +0200 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /net/tipc/net.h | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | kernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.tar.gz kernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.tar.xz kernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.zip | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'net/tipc/net.h')
| -rw-r--r-- | net/tipc/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.h b/net/tipc/net.h index a6a0e9976ac..d154ac2bda9 100644 --- a/net/tipc/net.h +++ b/net/tipc/net.h @@ -58,7 +58,7 @@ void tipc_net_route_msg(struct sk_buff *buf); struct node *tipc_net_select_remote_node(u32 addr, u32 ref); u32 tipc_net_select_router(u32 addr, u32 ref); -int tipc_net_start(void); +int tipc_net_start(u32 addr); void tipc_net_stop(void); #endif |