Merge commit 'v2.6.35-rc6' into devicetree/next

[net-next-2.6.git] / arch / sparc / kernel / prom_64.c

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 466a32763ea82fbe0bd644fb5468459a7fe4196f..86597d9867fd3768dcca56ec3a9263db1deed6fc 100644 (file)
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -21,7 +21,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/memblock.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 
 #include <asm/prom.h>
 #include <asm/oplib.h>
@@ -81,7 +81,7 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
                return;
 
        regs = rprop->value;
-       if (!is_root_node(dp->parent)) {
+       if (!of_node_is_root(dp->parent)) {
                sprintf(tmp_buf, "%s@%x,%x",
                        dp->name,
                        (unsigned int) (regs->phys_addr >> 32UL),
@@ -121,7 +121,7 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
                return;
 
        regs = prop->value;
-       if (!is_root_node(dp->parent)) {
+       if (!of_node_is_root(dp->parent)) {
                sprintf(tmp_buf, "%s@%x,%x",
                        dp->name,
                        (unsigned int) (regs->phys_addr >> 32UL),