Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[sfrench/cifs-2.6.git] / arch / sparc / kernel / prom_common.c

diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 57ac9e28be0caff3b08be55f0228fa8655863739..1f830da2ddf2317df09c8b62340c41050ba55883 100644 (file)
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -244,7 +244,7 @@ char * __init build_full_name(struct device_node *dp)
 
        n = prom_early_alloc(len);
        strcpy(n, dp->parent->full_name);
-       if (!is_root_node(dp->parent)) {
+       if (!of_node_is_root(dp->parent)) {
                strcpy(n + plen, "/");
                plen++;
        }