Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / net / tipc / node_subscr.c

diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index afeea121d8be0c12796754f004d6a8028aec732a..cff4068cc755295c8fa2708abb8bdeac93d97d82 100644 (file)
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
@@ -47,7 +47,7 @@
 void tipc_nodesub_subscribe(struct node_subscr *node_sub, u32 addr, 
                       void *usr_handle, net_ev_handler handle_down)
 {
-       node_sub->node = 0;
+       node_sub->node = NULL;
        if (addr == tipc_own_addr)
                return;
        if (!tipc_addr_node_valid(addr)) {