diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-08-26 16:06:47 +0400 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-09-05 08:33:59 +0400 |
| commit | ac840605f3b1d9b99e1e6629a54994f8e003ff91 (patch) | |
| tree | c0d47ef7ca41c4f88baa5e66b07f95ad586c7341 /arch/arm/mach-orion5x/mv2120-setup.c | |
| parent | fc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (diff) | |
| download | linux-ac840605f3b1d9b99e1e6629a54994f8e003ff91.tar.xz | |
mv643xx_eth: remove force_phy_addr field
Currently, there are two different fields in the
mv643xx_eth_platform_data struct that together describe the PHY
address -- one field (phy_addr) has the address of the PHY, but if
that address is zero, a second field (force_phy_addr) needs to be
set to distinguish the actual address zero from a zero due to not
having filled in the PHY address explicitly (which should mean
'use the default PHY address').
If we are a bit smarter about the encoding of the phy_addr field,
we can avoid the need for a second field -- this patch does that.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/mv2120-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mv2120-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index 978d4d599396..97c9ccb2ac60 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion5x/mv2120-setup.c @@ -39,7 +39,7 @@ * Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data mv2120_eth_data = { - .phy_addr = 8, + .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; static struct mv_sata_platform_data mv2120_sata_data = { |