diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-17 14:13:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-17 14:13:13 -0700 |
| commit | 2e5a3eaca386ce026f240c7b21e5c4958fcea946 (patch) | |
| tree | 191cf2b340d008b711137ce8c40b27a3dadff8d5 /arch/powerpc/platforms/pasemi/gpio_mdio.c | |
| parent | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (diff) | |
| parent | 36b30ea940bb88d88c90698e0e3d97a805ab5856 (diff) | |
| download | talos-op-linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.tar.gz talos-op-linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.zip | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/powerpc/platforms/pasemi/gpio_mdio.c')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c index b46542990cf8..ab6955412ba4 100644 --- a/arch/powerpc/platforms/pasemi/gpio_mdio.c +++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c @@ -241,7 +241,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev, new_bus->reset = &gpio_mdio_reset; prop = of_get_property(np, "reg", NULL); - new_bus->id = *prop; + snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop); new_bus->priv = priv; new_bus->phy_mask = 0; |
