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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
smsc-lan87xx.txt
diff --git
a/Documentation/devicetree/bindings/net/smsc-lan87xx.txt
b/Documentation/devicetree/bindings/net/smsc-lan87xx.txt
index 974edd5c85cc757322ad48d64cf64460cd0c7518..8b7c719b0bb94ecef956387b866bcb5fa7b39c58 100644
(file)
--- a/
Documentation/devicetree/bindings/net/smsc-lan87xx.txt
+++ b/
Documentation/devicetree/bindings/net/smsc-lan87xx.txt
@@
-15,7
+15,6
@@
smsc phy with disabled energy detect mode on an am335x based board.
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
- status = "okay";
ethernetphy0: ethernet-phy@0 {
reg = <0>;