Merge branch 'master' of 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 b6d6bdae95f25ffdd1019ad9b844760b5f054959..5c1b246aacccbd37d55027b1087150bdc8f2f9ec 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -368,7 +368,7 @@ static int __init gfar_of_init(void)
                                goto unreg;
                        }
 
-                       gfar_data.bus_id = 0;
+                       snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "0");
                        gfar_data.phy_id = fixed_link[0];
                } else {
                        phy = of_find_node_by_phandle(*ph);
@@ -389,7 +389,8 @@ static int __init gfar_of_init(void)
                        }
 
                        gfar_data.phy_id = *id;
-                       gfar_data.bus_id = res.start;
+                       snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x",
+                                       res.start);
 
                        of_node_put(phy);
                        of_node_put(mdio);