Merge branch 'timers-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / twl4030.dtsi

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 482b7aa..16533b6 100644 (file)
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -22,9 +22,9 @@
        charger: bci {
                compatible = "ti,twl4030-bci";
                interrupts = <9>, <2>;
-               io-channels = <&twl4030_madc 11>;
-               io-channel-name = "vac";
                bci3v1-supply = <&vusb3v1>;
+               io-channels = <&twl_madc 11>;
+               io-channel-names = "vac";
        };
 
        watchdog {