From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Feb 2013 12:25:20 +0000 (+0100)
Subject: Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
X-Git-Tag: v3.9-rc1~119^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acb7452369e4f8749dd32d48dbda98936035a87c;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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>
---

acb7452369e4f8749dd32d48dbda98936035a87c
diff --cc arch/arm/mach-omap2/drm.c
index 289e8cf,2a2cfa8,ab8a0e6..231ed5f
--- a/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)