diff options
Diffstat (limited to 'arch/sparc/kernel/prom_64.c')
| -rw-r--r-- | arch/sparc/kernel/prom_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index fb06ac2bd38f..0bffafdee350 100644 --- a/arch/sparc/kernel/prom_64.c +++ b/arch/sparc/kernel/prom_64.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/lmb.h> | 23 | #include <linux/lmb.h> |
| 24 | #include <linux/of_device.h> | 24 | #include <linux/of.h> |
| 25 | 25 | ||
| 26 | #include <asm/prom.h> | 26 | #include <asm/prom.h> |
| 27 | #include <asm/oplib.h> | 27 | #include <asm/oplib.h> |
| @@ -81,7 +81,7 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf) | |||
| 81 | return; | 81 | return; |
| 82 | 82 | ||
| 83 | regs = rprop->value; | 83 | regs = rprop->value; |
| 84 | if (!is_root_node(dp->parent)) { | 84 | if (!of_node_is_root(dp->parent)) { |
| 85 | sprintf(tmp_buf, "%s@%x,%x", | 85 | sprintf(tmp_buf, "%s@%x,%x", |
| 86 | dp->name, | 86 | dp->name, |
| 87 | (unsigned int) (regs->phys_addr >> 32UL), | 87 | (unsigned int) (regs->phys_addr >> 32UL), |
| @@ -121,7 +121,7 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf) | |||
| 121 | return; | 121 | return; |
| 122 | 122 | ||
| 123 | regs = prop->value; | 123 | regs = prop->value; |
| 124 | if (!is_root_node(dp->parent)) { | 124 | if (!of_node_is_root(dp->parent)) { |
| 125 | sprintf(tmp_buf, "%s@%x,%x", | 125 | sprintf(tmp_buf, "%s@%x,%x", |
| 126 | dp->name, | 126 | dp->name, |
| 127 | (unsigned int) (regs->phys_addr >> 32UL), | 127 | (unsigned int) (regs->phys_addr >> 32UL), |