aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-06-09 12:55:42 +0800
committerAlex Shi <alex.shi@linaro.org>2014-06-09 12:55:42 +0800
commit3b8d7f4db34913c8e2ea0177723784b646f7424e (patch)
tree1c28a8a8c273dffd031935f5ee509db5c5e0f386 /arch/arm/boot
parentf669f023e2ce45ab6e289bd980d435e1dae0e362 (diff)
parentc2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff)
downloadlinux-linaro-stable-3b8d7f4db34913c8e2ea0177723784b646f7424e.tar.gz
Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx53.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index eb83aa039b8b..e524316998f4 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -71,7 +71,7 @@
ipu: ipu@18000000 {
#crtc-cells = <1>;
compatible = "fsl,imx53-ipu";
- reg = <0x18000000 0x080000000>;
+ reg = <0x18000000 0x08000000>;
interrupts = <11 10>;
clocks = <&clks 59>, <&clks 110>, <&clks 61>;
clock-names = "bus", "di0", "di1";