Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git...

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>

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_2420_data.c
index e8efe3d1da6c786639eef9e924b26d3e09096fdf,10af996aa4799ce79251d0bb4fdb413fff197ea6..b5efe58c0be09cb4953dfcb70e0e93f21524a721
--- 1/arch/arm/mach-omap2/omap_hwmod_2420_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@@ -15,8 -15,9 +15,8 @@@
  
  #include <linux/i2c-omap.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
--
- #include <plat-omap/dma-omap.h>
+ #include <linux/omap-dma.h>
+ #include <plat/dmtimer.h>
  
  #include "omap_hwmod.h"
  #include "l3_2xxx.h"

diff --cc arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 32d17e3fd72747e62f509d5888c1d8a2cb9eef19,f14b894ce761da60c9c5666c242890d16449191f..6c8fa70ddaddad333545bb10a9e5d5bfe4204950
--- 1/arch/arm/mach-omap2/omap_hwmod_2430_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@@ -16,8 -16,9 +16,8 @@@
  #include <linux/i2c-omap.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
--
- #include <plat-omap/dma-omap.h>
+ #include <linux/omap-dma.h>
+ #include <plat/dmtimer.h>
  
  #include "omap_hwmod.h"
  #include "mmc.h"

diff --cc arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index f5b55a78a5f0fa0842976b8ca26d625210f39e37,61e807f2a79848c87f0b1234a4ecfef192acbfb7..219fb075741bbb492d0bc5089df5701ed5de751e
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -23,9 -23,8 +23,9 @@@
  #include <linux/power/smartreflex.h>
  #include <linux/i2c-omap.h>
  
- #include <plat-omap/dma-omap.h>
+ #include <linux/omap-dma.h>
  
 +#include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <plat/dmtimer.h>