diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-05-28 10:17:39 -0400 |
---|---|---|
committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-06-22 16:44:48 -0400 |
commit | 2850a037734eac0af2e6abc4e8be986c3edfd834 (patch) | |
tree | ab0e8a470dc8464fff2452b2580cc41b397a8ccc /arch/arm/mach-orion5x/ts209-setup.c | |
parent | b206ed0462b7112d07bb9f245bf49f5e95ff174a (diff) |
[ARM] Orion: avoid setting ->force_phy_addr
The mv643xx_eth platform data field ->force_phy_addr only needs
to be set if the passed-in ->phy_addr field is zero (to distinguish
the case of not having specified a phy address
(force_phy_addr = 0) from the case where a phy address of zero needs
to be used (force_phy_addr = 1.))
Also, the ->force_phy_addr field will hopefully disappear in a
future mv643xx_eth reorganisation.
Therefore, this patch deletes the ->force_phy_addr field initialiser
from all Orion board code.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/ts209-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 5ad7ad9b9461..80b62329f586 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
@@ -191,7 +191,6 @@ subsys_initcall(qnap_ts209_pci_init); | |||
191 | 191 | ||
192 | static struct mv643xx_eth_platform_data qnap_ts209_eth_data = { | 192 | static struct mv643xx_eth_platform_data qnap_ts209_eth_data = { |
193 | .phy_addr = 8, | 193 | .phy_addr = 8, |
194 | .force_phy_addr = 1, | ||
195 | }; | 194 | }; |
196 | 195 | ||
197 | static int __init parse_hex_nibble(char n) | 196 | static int __init parse_hex_nibble(char n) |