[PATCH 02/16] ARM: davinci: move platform_data definitions
gururaja.hebbar at ti.com
Thu Sep 13 03:00:54 EDT 2012
On Wed, Sep 12, 2012 at 22:41:09, Arnd Bergmann wrote:
> On Wednesday 12 September 2012, Hebbar, Gururaja wrote:
> > On Tue, Sep 11, 2012 at 18:29:36, Arnd Bergmann wrote:
> > > drivers/usb/musb/da8xx.c | 2 +-
> > > .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
> > This will clash with patch "ASoC/ARM: Davinci: McASP: split asp header into
> > platform and audio specific" queued in ASoC tree by Mark
> Ok, I've taken out that hunk, this is the remaining patch. There will
> still be minor conflicts though, because it changes some adjacent lines.
Thanks for the consideration.
More information about the linux-arm-kernel