Merge branch 'linus' into x86/urgent

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

diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi
index 34c7fe6751cf98da48ee2584e406c1e87f1e2ed2..6d8dd3cdd3c08c19d643aba45a66401a6b333fe9 100644 (file)
--- a/arch/arm/boot/dts/s3c24xx.dtsi
+++ b/arch/arm/boot/dts/s3c24xx.dtsi
@@ -5,11 +5,11 @@
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
  */
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "samsung,s3c24xx";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                pinctrl0 = &pinctrl_0;