diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
| commit | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch) | |
| tree | bdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/ucc_geth.c | |
| parent | 461e6c856faf9cdd8862fa4d0785974a64e39dba (diff) | |
| parent | f946dffed6334f08da065a89ed65026ebf8b33b4 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 29a4d650e8a8..0aac91c3e4e4 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -3926,7 +3926,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
| 3926 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); | 3926 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); |
| 3927 | fixed_link = of_get_property(np, "fixed-link", NULL); | 3927 | fixed_link = of_get_property(np, "fixed-link", NULL); |
| 3928 | if (fixed_link) { | 3928 | if (fixed_link) { |
| 3929 | ug_info->mdio_bus = 0; | 3929 | snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "0"); |
| 3930 | ug_info->phy_address = fixed_link[0]; | 3930 | ug_info->phy_address = fixed_link[0]; |
| 3931 | phy = NULL; | 3931 | phy = NULL; |
| 3932 | } else { | 3932 | } else { |