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 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
omap3.dtsi
diff --git
a/arch/arm/boot/dts/omap3.dtsi
b/arch/arm/boot/dts/omap3.dtsi
index 226f3631c230252cabc60403fc706ea862d11b7a..d0e884d3a7372f003f1777aeba1f6ccc15c2e26c 100644
(file)
--- a/
arch/arm/boot/dts/omap3.dtsi
+++ b/
arch/arm/boot/dts/omap3.dtsi
@@
-141,10
+141,9
@@
};
intc: interrupt-controller@48200000 {
- compatible = "ti,omap
2
-intc";
+ compatible = "ti,omap
3
-intc";
interrupt-controller;
#interrupt-cells = <1>;
- ti,intc-size = <96>;
reg = <0x48200000 0x1000>;
};