Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / zx296702.dtsi

diff --git a/arch/arm/boot/dts/zx296702.dtsi b/arch/arm/boot/dts/zx296702.dtsi
index 752d28e0f9b0181b5dd2d52cbb02e55b9ec9e63f..8a74efdb636062e28e309e130f557e5bc582d65f 100644 (file)
--- a/arch/arm/boot/dts/zx296702.dtsi
+++ b/arch/arm/boot/dts/zx296702.dtsi
@@ -38,7 +38,7 @@
                        reg = <0x00400000 0x1000>;
                };
 
-               intc: interrupt-controller@00801000 {
+               intc: interrupt-controller@801000 {
                        compatible = "arm,cortex-a9-gic";
                        #interrupt-cells = <3>;
                        #address-cells = <1>;
@@ -48,7 +48,7 @@
                              <0x00800100 0x100>;
                };
 
-               global_timer: timer@008000200 {
+               global_timer: timer@8000200 {
                        compatible = "arm,cortex-a9-global-timer";
                        reg = <0x00800200 0x20>;
                        interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;