Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap3-overo-base.dtsi

diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index cd220342a805aa2844613b171a31279a651407b1..f25e158e7163b23201ca8e643f557b3965fc959d 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -181,7 +181,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins>;
        vmmc-supply = <&w3cbw003c_npoweron>;
-       vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
+       vqmmc-supply = <&w3cbw003c_wifi_nreset>;
        bus-width = <4>;
        cap-sdio-irq;
        non-removable;