projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
of_device_64.c
diff --git
a/arch/sparc/kernel/of_device_64.c
b/arch/sparc/kernel/of_device_64.c
index
0a6f2d1
..
b3d4cb5
100644
(file)
--- a/
arch/sparc/kernel/of_device_64.c
+++ b/
arch/sparc/kernel/of_device_64.c
@@
-676,7
+676,7
@@
static struct of_device * __init scan_one_device(struct device_node *dp,
if (!parent)
dev_set_name(&op->dev, "root");
else
- dev_set_name(&op->dev, "%08x", dp->
nod
e);
+ dev_set_name(&op->dev, "%08x", dp->
phandl
e);
if (of_device_register(op)) {
printk("%s: Could not register of device.\n",