Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the register accesses are done slightly differently in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1303,6 +1303,8 @@ static void vsc8584_get_base_addr(struct phy_device *phydev)
|
||||
vsc8531->base_addr = phydev->mdio.addr + addr;
|
||||
else
|
||||
vsc8531->base_addr = phydev->mdio.addr - addr;
|
||||
|
||||
vsc8531->addr = addr;
|
||||
}
|
||||
|
||||
static int vsc8584_config_init(struct phy_device *phydev)
|
||||
|
Reference in New Issue
Block a user