Merge tag 'omap-for-v3.8/cleanup-multiplatform-signed' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 26 Nov 2012 22:23:24 +0000 (14:23 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 26 Nov 2012 22:23:24 +0000 (14:23 -0800)
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.

Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.

Conflicts:
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c


Trivial merge