* Sebastian Reichel <sre@xxxxxxxxxx> [151106 08:14]: > This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, > which breaks the omap3 device tree build due to a wrong reference. > > I accidently queued this change via the power supply subsystem while > telling Marek at the same time, that it should go through Tony's tree. > Following that I did miss Stephen's messages about the build failure in > linux-next and since he switched to merging an older snapshot nobody > else noticed the problem in my tree. I didn't notice myself, since I > did not build any device tree files assuming none have changed by me. Good to hear you figured out how it happened :) Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> > --- > arch/arm/boot/dts/twl4030.dtsi | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi > index 482b7aa37808..36ae9160b558 100644 > --- a/arch/arm/boot/dts/twl4030.dtsi > +++ b/arch/arm/boot/dts/twl4030.dtsi > @@ -22,8 +22,6 @@ > charger: bci { > compatible = "ti,twl4030-bci"; > interrupts = <9>, <2>; > - io-channels = <&twl4030_madc 11>; > - io-channel-name = "vac"; > bci3v1-supply = <&vusb3v1>; > }; > > -- > 2.6.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html