diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-15 13:25:20 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-15 13:31:52 +0100 |
| commit | acb7452369e4f8749dd32d48dbda98936035a87c (patch) | |
| tree | 34219b164e90f14bb5a551f5ab28987b58a35999 /arch/arm/mach-pxa/colibri-pxa270-income.c | |
| parent | dad2d9e666cbd733afff855f5224dd7e8a7996d3 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 6929e24e4cc46ce8d5b7dd8f8bdf4244c8d77f76 (diff) | |
| download | blackbird-obmc-linux-acb7452369e4f8749dd32d48dbda98936035a87c.tar.gz blackbird-obmc-linux-acb7452369e4f8749dd32d48dbda98936035a87c.zip | |
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>
