projects
/
cascardo
/
linux.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/viro/vfs
[cascardo/linux.git]
/
Documentation
/
devicetree
/
bindings
/
arm
/
cci.txt
diff --git
a/Documentation/devicetree/bindings/arm/cci.txt
b/Documentation/devicetree/bindings/arm/cci.txt
index
a1a5a7e
..
0f2153e
100644
(file)
--- a/
Documentation/devicetree/bindings/arm/cci.txt
+++ b/
Documentation/devicetree/bindings/arm/cci.txt
@@
-100,7
+100,7
@@
specific to ARM.
"arm,cci-400-pmu,r0"
"arm,cci-400-pmu,r1"
"arm,cci-400-pmu" - DEPRECATED, permitted only where OS has
- secure acces to CCI registers
+ secure acces
s
to CCI registers
"arm,cci-500-pmu,r0"
"arm,cci-550-pmu,r0"
- reg: