Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5250-snow-common.dtsi

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index c952a61..6635f61 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -217,7 +217,7 @@
                };
        };
 
-       mmc3_pwrseq: mmc3_pwrseq {
+       mmc3_pwrseq: mmc3-pwrseq {
                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpx0 2 GPIO_ACTIVE_LOW>, /* WIFI_RSTn */
                              <&gpx0 1 GPIO_ACTIVE_LOW>; /* WIFI_EN */
@@ -289,7 +289,7 @@
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <378000>;
 
-       max77686: max77686@9 {
+       max77686: pmic@9 {
                compatible = "maxim,max77686";
                interrupt-parent = <&gpx3>;
                interrupts = <2 IRQ_TYPE_NONE>;