summaryrefslogtreecommitdiff
path: root/net/tipc/net.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-04 21:04:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-04 21:04:04 +0200
commit8040d77688014987ca5738bf1731db72ab273441 (patch)
tree99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /net/tipc/net.c
parentfb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff)
parent268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff)
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r--net/tipc/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index ec7b04fbdc43..7906608bf510 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -118,7 +118,7 @@
DEFINE_RWLOCK(tipc_net_lock);
struct network tipc_net = { NULL };
-struct node *tipc_net_select_remote_node(u32 addr, u32 ref)
+struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref)
{
return tipc_zone_select_remote_node(tipc_net.zones[tipc_zone(addr)], addr, ref);
}