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 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-lxm.dts
diff --git
a/arch/arm/boot/dts/am335x-lxm.dts
b/arch/arm/boot/dts/am335x-lxm.dts
index 481edcfaf121e16144123b3fbf0ed38699d5b770..d0e8e720a4d6b5f5d0b9a0ec8970eaeea5ef27bd 100644
(file)
--- a/
arch/arm/boot/dts/am335x-lxm.dts
+++ b/
arch/arm/boot/dts/am335x-lxm.dts
@@
-328,10
+328,6
@@
dual_emac_res_vlan = <3>;
};
-&phy_sel {
- rmii-clock-ext;
-};
-
&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;