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 tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
brcm,amac.txt
diff --git
a/Documentation/devicetree/bindings/net/brcm,amac.txt
b/Documentation/devicetree/bindings/net/brcm,amac.txt
index ad16c1f481f77fed199e1c24bc3450aa75fbb970..0bfad656a9ff26fc4f672e06f1123198bb9259e7 100644
(file)
--- a/
Documentation/devicetree/bindings/net/brcm,amac.txt
+++ b/
Documentation/devicetree/bindings/net/brcm,amac.txt
@@
-27,5
+27,4
@@
amac0: ethernet@18022000 {
<0x18110000 0x1000>;
reg-names = "amac_base", "idm_base";
interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
};