git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'integration' into for-linus
[pandora-kernel.git]
/
Documentation
/
devicetree
/
bindings
/
powerpc
/
fsl
/
mpic.txt
diff --git
a/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
b/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
index
4f61458
..
2cf38bd
100644
(file)
--- a/
Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
+++ b/
Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
@@
-190,7
+190,7
@@
EXAMPLE 4
*/
timer0: timer@41100 {
compatible = "fsl,mpic-global-timer";
- reg = <0x41100 0x100>;
+ reg = <0x41100 0x100
0x41300 4
>;
interrupts = <0 0 3 0
1 0 3 0
2 0 3 0