git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-radeon-evergreen-accel' into drm-core-next
[pandora-kernel.git]
/
arch
/
mips
/
ar7
/
platform.c
diff --git
a/arch/mips/ar7/platform.c
b/arch/mips/ar7/platform.c
index
246df7a
..
2fafc78
100644
(file)
--- a/
arch/mips/ar7/platform.c
+++ b/
arch/mips/ar7/platform.c
@@
-168,7
+168,7
@@
static struct plat_vlynq_data vlynq_high_data = {
.on = vlynq_on,
.off = vlynq_off,
},
.on = vlynq_on,
.off = vlynq_off,
},
- .reset_bit =
2
6,
+ .reset_bit =
1
6,
.gpio_bit = 19,
};
.gpio_bit = 19,
};
@@
-600,6
+600,7
@@
static int __init ar7_register_devices(void)
}
if (ar7_has_high_cpmac()) {
}
if (ar7_has_high_cpmac()) {
+ res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
if (!res) {
cpmac_get_mac(1, cpmac_high_data.dev_addr);
if (!res) {
cpmac_get_mac(1, cpmac_high_data.dev_addr);