git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun4i-a10-a1000.dts
diff --git
a/arch/arm/boot/dts/sun4i-a10-a1000.dts
b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 6c254ec4c85b71faaff83da262ab59d4d3794211..8692b11a83c3ffc758da7a8dbd8a251c7a15b4cd 100644
(file)
--- a/
arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/
arch/arm/boot/dts/sun4i-a10-a1000.dts
@@
-125,7
+125,7
@@
};
&emac {
- phy = <&phy1>;
+ phy
-handle
= <&phy1>;
status = "okay";
};