projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da721...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
integratorcp.dts
diff --git
a/arch/arm/boot/dts/integratorcp.dts
b/arch/arm/boot/dts/integratorcp.dts
index
d43f15b
..
79430fb
100644
(file)
--- a/
arch/arm/boot/dts/integratorcp.dts
+++ b/
arch/arm/boot/dts/integratorcp.dts
@@
-94,7
+94,7
@@
};
syscon {
- compatible = "arm,integrator-cp-syscon";
+ compatible = "arm,integrator-cp-syscon"
, "syscon"
;
reg = <0xcb000000 0x100>;
};