Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-sama5d3_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index f3e2b96c06a361ed01f240797f299ae4a129249c..c51fc652f6c72639654150919ab7f03b3b7fecbc 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -297,7 +297,7 @@
                };
        };
 
-       vcc_mmc0_reg: fixedregulator@0 {
+       vcc_mmc0_reg: fixedregulator_mmc0 {
                compatible = "regulator-fixed";
                gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
                regulator-name = "mmc0-card-supply";