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/addr.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/addr.h')
| -rw-r--r-- | net/tipc/addr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/addr.h b/net/tipc/addr.h index 02ca71783e2..bcfebb3cbbf 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 |