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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
oxnas-dwmac.txt
diff --git
a/Documentation/devicetree/bindings/net/oxnas-dwmac.txt
b/Documentation/devicetree/bindings/net/oxnas-dwmac.txt
index df0534e2eda1a05da205b7ba580d7058a5a138fb..d7117a22fd870070950e2c6c811f244f2b8f2979 100644
(file)
--- a/
Documentation/devicetree/bindings/net/oxnas-dwmac.txt
+++ b/
Documentation/devicetree/bindings/net/oxnas-dwmac.txt
@@
-35,5
+35,4
@@
etha: ethernet@40400000 {
/* Regmap for sys registers */
oxsemi,sys-ctrl = <&sys>;
- status = "disabled";
};