Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood-linkstation.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
index 69061b6e987b86de8adf408e3477e45457b050fb..36c54c9dfa3095c46a283720f48be18147f45748 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-linkstation.dtsi
+++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
@@ -49,15 +49,6 @@
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pmx_power_hdd0: pmx-power-hdd0 {
@@ -200,3 +191,11 @@
                };
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};