projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4210.dtsi
diff --git
a/arch/arm/boot/dts/exynos4210.dtsi
b/arch/arm/boot/dts/exynos4210.dtsi
index 66e6b03bf35e71b54f7c95cbf5e33bb6744464e0..54710de829086f8b94fd0202a696f967dea72733 100644
(file)
--- a/
arch/arm/boot/dts/exynos4210.dtsi
+++ b/
arch/arm/boot/dts/exynos4210.dtsi
@@
-41,6
+41,7
@@
};
combiner:interrupt-controller@10440000 {
+ samsung,combiner-nr = <16>;
interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
<0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
<0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,