diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
tree | 797676a336b050bfa1ef879377c07e541b9075d6 /arch/mips/ar7/platform.c | |
parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/mips/ar7/platform.c')
-rw-r--r-- | arch/mips/ar7/platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c index 246df7aca2e7..2fafc78e5ce1 100644 --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c | |||
@@ -168,7 +168,7 @@ static struct plat_vlynq_data vlynq_high_data = { | |||
168 | .on = vlynq_on, | 168 | .on = vlynq_on, |
169 | .off = vlynq_off, | 169 | .off = vlynq_off, |
170 | }, | 170 | }, |
171 | .reset_bit = 26, | 171 | .reset_bit = 16, |
172 | .gpio_bit = 19, | 172 | .gpio_bit = 19, |
173 | }; | 173 | }; |
174 | 174 | ||
@@ -600,6 +600,7 @@ static int __init ar7_register_devices(void) | |||
600 | } | 600 | } |
601 | 601 | ||
602 | if (ar7_has_high_cpmac()) { | 602 | if (ar7_has_high_cpmac()) { |
603 | res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status); | ||
603 | if (!res) { | 604 | if (!res) { |
604 | cpmac_get_mac(1, cpmac_high_data.dev_addr); | 605 | cpmac_get_mac(1, cpmac_high_data.dev_addr); |
605 | 606 | ||