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/wrt350n-v2-setup.c | |
| parent | fc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (diff) | |
| download | linux-ac840605f3b1d9b99e1e6629a54994f8e003ff91.tar.gz | |
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/wrt350n-v2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c index b10da17b3fbd..9a4fd5256462 100644 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c @@ -100,7 +100,7 @@ static struct platform_device wrt350n_v2_nor_flash = { }; static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = { - .phy_addr = -1, + .phy_addr = MV643XX_ETH_PHY_NONE, .speed = SPEED_1000, .duplex = DUPLEX_FULL, }; |