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 /drivers/net/fs_enet/fs_enet-main.c | |
| parent | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (diff) | |
| parent | 36b30ea940bb88d88c90698e0e3d97a805ab5856 (diff) | |
| download | blackbird-obmc-linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.tar.gz blackbird-obmc-linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.zip | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/fs_enet/fs_enet-main.c')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 940e2041ba38..67b4b0728fce 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -1178,7 +1178,7 @@ static int __devinit find_phy(struct device_node *np, data = of_get_property(np, "fixed-link", NULL); if (data) { - snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data); + snprintf(fpi->bus_id, 16, "%x:%02x", 0, *data); return 0; } @@ -1202,7 +1202,7 @@ static int __devinit find_phy(struct device_node *np, if (!data || len != 4) goto out_put_mdio; - snprintf(fpi->bus_id, 16, PHY_ID_FMT, res.start, *data); + snprintf(fpi->bus_id, 16, "%x:%02x", res.start, *data); out_put_mdio: of_node_put(mdionode); |
