[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

[linux-2.6-omap-h63xx.git] / net / tipc / addr.h

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 02ca71783e2e5b9c2eae5e426e6243460f14fe02..bcfebb3cbbf319f31e8c6bd4af45e7688c1c13bf 100644 (file)
--- 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