Merge remote-tracking branch 'regmap/fix/rbtree' into regmap-linus

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5250-arndale.dts

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 85dad29c08dc745028739efd45d2e6bfdf84b780..ea70603f660dba591daa5f7d1bd8ea17f329fde2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -14,6 +14,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/input/input.h>
 #include "exynos5250.dtsi"
+#include "exynos-mfc-reserved-memory.dtsi"
 
 / {
        model = "Insignal Arndale evaluation board based on EXYNOS5250";
@@ -515,11 +516,6 @@
        status = "okay";
 };
 
-&mfc {
-       samsung,mfc-r = <0x43000000 0x800000>;
-       samsung,mfc-l = <0x51000000 0x800000>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;