Merge branch 'akpm' (patches from Andrew)

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

diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi
index 0e4c7c4c8c0930c81a6e8f1925a9cf0343a4b76e..610506723ea5de1c6e0458445085890726fe7ee7 100644 (file)
--- a/arch/arm/boot/dts/arm-realview-eb.dtsi
+++ b/arch/arm/boot/dts/arm-realview-eb.dtsi
@@ -22,9 +22,10 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "arm,realview-eb";
 
        chosen { };
@@ -38,6 +39,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* 128 MiB memory @ 0x0 */
                reg = <0x00000000 0x08000000>;
        };