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 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
hsi
/
omap-ssi.txt
diff --git
a/Documentation/devicetree/bindings/hsi/omap-ssi.txt
b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
index f26625e4269363355d8e402299b3d3a91b88b793..b8eca3c7810dfb0ca184339537cd1e3e43383ac2 100644
(file)
--- a/
Documentation/devicetree/bindings/hsi/omap-ssi.txt
+++ b/
Documentation/devicetree/bindings/hsi/omap-ssi.txt
@@
-92,6
+92,5
@@
ssi-controller@48058000 {
interrupts = <69>,
<70>;
- status = "disabled"; /* second port is not used on N900 */
}
}