diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-10 22:55:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-10 22:55:14 +0100 |
| commit | fb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch) | |
| tree | ee3d535ab38d680b424a857406789f8c28bf5266 /net/dsa | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-fb28ad35906af2f042c94e2f9c0f898ef9acfa37.tar.xz linux-fb28ad35906af2f042c94e2f9c0f898ef9acfa37.zip | |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 37616884b8a9..7384bad81652 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -284,7 +284,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, netif_carrier_off(slave_dev); if (p->phy != NULL) { - phy_attach(slave_dev, p->phy->dev.bus_id, + phy_attach(slave_dev, dev_name(&p->phy->dev), 0, PHY_INTERFACE_MODE_GMII); p->phy->autoneg = AUTONEG_ENABLE; |