Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6

[cascardo/linux.git] / arch / arm / boot / dts / exynos4.dtsi

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 359694c..3f94fe8 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -19,7 +19,7 @@
  * published by the Free Software Foundation.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
        interrupt-parent = <&gic>;
@@ -160,6 +160,8 @@
                reg = <0x13400000 0x10000>;
                interrupts = <0 94 0>;
                samsung,power-domain = <&pd_mfc>;
+               clocks = <&clock 170>, <&clock 273>;
+               clock-names = "sclk_mfc", "mfc";
                status = "disabled";
        };