Merge commit 'jwb/jwb-merge' into merge

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8572ds.dts

diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 21459e161d02ee0513a6db3c44e928eb884d401f..359c3b727420fec88a5f2585744b0f3b6c923f5e 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -89,7 +89,7 @@
 
                        ramdisk@0 {
                                reg = <0x0 0x03000000>;
-                               readl-only;
+                               read-only;
                        };
 
                        diagnostic@3000000 {
@@ -724,7 +724,7 @@
                          0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
-               interrupts = <26 2>;
+               interrupts = <25 2>;
                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                interrupt-map = <
                        /* IDSEL 0x0 */
@@ -761,7 +761,7 @@
                          0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
-               interrupts = <27 2>;
+               interrupts = <26 2>;
                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                interrupt-map = <
                        /* IDSEL 0x0 */