summaryrefslogtreecommitdiffstats
path: root/net/tipc/addr.h
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-01-20 08:59:41 +0000
committerSteven Whitehouse <steve@chygwyn.com>2006-01-20 08:59:41 +0000
commit044399b2cb6ad2d7f63cfca945268853d7443a4d (patch)
tree5f96eb307b0389ac0b919a4744a40862b615e9da /net/tipc/addr.h
parent901359256b2666f52a3a7d3f31927677e91b3a2a (diff)
parent18a4144028f056b77d6576d4eb284246e9c7ea97 (diff)
downloadop-kernel-dev-044399b2cb6ad2d7f63cfca945268853d7443a4d.zip
op-kernel-dev-044399b2cb6ad2d7f63cfca945268853d7443a4d.tar.gz
Merge branch 'master'
Diffstat (limited to 'net/tipc/addr.h')
-rw-r--r--net/tipc/addr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 02ca717..bcfebb3 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -122,7 +122,7 @@ static inline char *addr_string_fill(char *string, u32 addr)
return string;
}
-int addr_domain_valid(u32);
-int addr_node_valid(u32 addr);
+int tipc_addr_domain_valid(u32);
+int tipc_addr_node_valid(u32 addr);
#endif
OpenPOWER on IntegriCloud