[GIT PULL] omap twl cleanup for v3.1 merge window
tony at atomide.com
Sun Jul 10 06:17:05 EDT 2011
* Tony Lindgren <tony at atomide.com> [110709 23:50]:
> * Arnd Bergmann <arnd at arndb.de> [110708 08:36]:
> > On Friday 08 July 2011, Tony Lindgren wrote:
> > >
> > >I've attached a conflict resolution patch too, it's trivial execpt
> > >note that .vdac needs to be removed in board-rx51-peripherals.c.
> > >
> > >If this conflict causes problems for you, I can also base this series
> > >on omap/board.
> > The conflict resolution you suggested doesn't build here:
> > These are removed in the cleanup series, but changed in the fixes branch,
> > now the removal is undone
> Hmm these are added in omap/board. Maybe the issue is caused by not
> merging omap/board also?
Looks like what got added in in omap/board should now work with the
TWL default values in twl-common.c. So most likely those can just be
dropped. Will check that today.
More information about the linux-arm-kernel