Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git...
authorOlof Johansson <olof@lixom.net>
Sat, 1 Dec 2012 05:47:21 +0000 (21:47 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 1 Dec 2012 05:47:21 +0000 (21:47 -0800)
commit48d224d1efec98b0b78e511150b4f5752beceb7c
tree6777113a72a73fdf4e8d84f7447c32b25fa902a9
parent9121dfca73d81fa886f15610cac2bf372391f3eb
parent45c3eb7d3a07eb08d1b5b0f5983a996d41610b84
Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/pm2

From Tony Lindgren:
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.

* tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
  ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
  watchdog: OMAP: fixup for ARM multiplatform support

Conflicts due to surrounding changes in:
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-omap2/devices.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_2xxx_ipblock_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c