diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-08-26 14:06:47 +0200 |
---|---|---|
committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-09-05 06:33:59 +0200 |
commit | ac840605f3b1d9b99e1e6629a54994f8e003ff91 (patch) | |
tree | c0d47ef7ca41c4f88baa5e66b07f95ad586c7341 /arch/arm/mach-orion5x/mss2-setup.c | |
parent | fc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (diff) | |
download | linux-ac840605f3b1d9b99e1e6629a54994f8e003ff91.tar.gz linux-ac840605f3b1d9b99e1e6629a54994f8e003ff91.tar.bz2 linux-ac840605f3b1d9b99e1e6629a54994f8e003ff91.zip |
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/mss2-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/mss2-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 53ff1893b883..68acca98e638 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c @@ -109,7 +109,7 @@ subsys_initcall(mss2_pci_init); ****************************************************************************/ static struct mv643xx_eth_platform_data mss2_eth_data = { - .phy_addr = 8, + .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; /***************************************************************************** |