Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes

[cascardo/linux.git] / arch / arm / boot / dts / exynos4210-smdkv310.dts

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 94ca7d3..847fae3 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -17,6 +17,7 @@
 /dts-v1/;
 #include "exynos4210.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include "exynos-mfc-reserved-memory.dtsi"
 
 / {
        model = "Samsung smdkv310 evaluation board based on Exynos4210";
@@ -132,12 +133,6 @@
        };
 };
 
-&mfc {
-       samsung,mfc-r = <0x43000000 0x800000>;
-       samsung,mfc-l = <0x51000000 0x800000>;
-       status = "okay";
-};
-
 &pinctrl_1 {
        keypad_rows: keypad-rows {
                samsung,pins = "gpx2-0", "gpx2-1";