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.armlinux.org.uk/~rmk/linux-arm
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
reset
/
nxp,lpc1850-rgu.txt
diff --git
a/Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
b/Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
index b4e96a27844527cc7bda3081d59a5fe61d5492d4..05d5be48dae44d39a165a257d915348c406a8008 100644
(file)
--- a/
Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
+++ b/
Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
@@
-80,5
+80,4
@@
mac: ethernet@40010000 {
clock-names = "stmmaceth";
resets = <&rgu 22>;
reset-names = "stmmaceth";
- status = "disabled";
};