projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6-block.git]
/
arch
/
powerpc
/
sysdev
/
fsl_soc.c
diff --git
a/arch/powerpc/sysdev/fsl_soc.c
b/arch/powerpc/sysdev/fsl_soc.c
index 324c01b70dddfc14701210dc1547c3dfd9a65fab..3a7054e2bb75722a731632af377da31f6420496b 100644
(file)
--- a/
arch/powerpc/sysdev/fsl_soc.c
+++ b/
arch/powerpc/sysdev/fsl_soc.c
@@
-389,8
+389,8
@@
static int __init gfar_of_init(void)
}
gfar_data.phy_id = *id;
- snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x",
-
res.start);
+ snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%
ll
x",
+
(unsigned long long)
res.start);
of_node_put(phy);
of_node_put(mdio);