Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform

The omap multiplatform support uncovered a bug in the cwdavinci_cpdma
code and was missing two drivers that are enabled now but are not
quite ready for multiplatform, as found by allyesconfig builds.

There is also a conflict generated by automated merge in
arch/arm/mach-omap2/drm.c between a bug fix that went into v3.8-rc5
and a different version of the same fix that went into the
omap/multiplatform branch. This merge removes the extraneous
 #include that was causing build errors.

* omap/multiplatform-fixes:
  net: cwdavinci_cpdma: export symbols for cpsw
  remoteproc: omap: depend on OMAP_MBOX_FWK
  [media] davinci: do not include mach/hardware.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

diff --cc arch/arm/mach-omap2/drm.c
index 289e8cfb594cdab861dd51a112b025d7e994f15c,2a2cfa88ddbfdd456b6522c678ac7321057ad517,ab8a0e64c5f7fa12e0be877588fd9eb5f0b1d57b..231ed5f2bc816bd607dd877e64a3f5eccdcc9b07
--- 1/arch/arm/mach-omap2/drm.c
--- 2/arch/arm/mach-omap2/drm.c
--- 3/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@@@ -25,9 -25,9 -25,8 +25,9 @@@@
   #include <linux/dma-mapping.h>
   #include <linux/platform_data/omap_drm.h>
   
+ +#include "soc.h"
   #include "omap_device.h"
   #include "omap_hwmod.h"
-  #include "soc.h"
   
   #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
   

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