Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / kirkwood-db.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index ca8bf362748ab78f95288af40289de6d27594954..c0e2a587917474a37a515ff7c70e133ee193f0ba 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -12,7 +12,7 @@
  * and 6282 variants of the Marvell Kirkwood Development Board.
  */
 
-/include/ "kirkwood.dtsi"
+#include "kirkwood.dtsi"
 
 / {
        memory {
@@ -77,14 +77,6 @@
                        cd-gpios = <&gpio1 6 0>;
                        status = "okay";
                };
-
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
        };
 };