forked from Minki/linux
acb7452369
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRAuO3AAoJEHm+PkMAQRiGbfAH/1C3QQKB11aBpYLAw7qijAze yOui26UCnwRryxsO8zBCQjGoByy5DvY/Q0zyUCWUE6nf/JFSoKGUHzfJ1ATyzGll 3vENP6Fnmq0Hgc4t8/gXtXrZ1k/c43cYA2XEhDnEsJlFNmNj2wCQQj9njTNn2cl1 k6XhZ9U1V2hGYpLL5bmsZiLVI6dIpkCVw8d4GZ8BKxSLUacVKMS7ml2kZqxBTMgt AF6T2SPagBBxxNq8q87x4b7vyHYchZmk+9tAV8UMs1ecimasLK8vrRAJvkXXaH1t xgtR0sfIp5raEjoFYswCK+cf5NEusLZDKOEvoABFfEgL4/RKFZ8w7MMsmG8m0rk= =m68Y -----END PGP SIGNATURE----- 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> |
||
|---|---|---|
| .. | ||
| blackfin | ||
| davinci | ||
| exynos-gsc | ||
| marvell-ccic | ||
| omap | ||
| omap3isp | ||
| s3c-camif | ||
| s5p-fimc | ||
| s5p-g2d | ||
| s5p-jpeg | ||
| s5p-mfc | ||
| s5p-tv | ||
| soc_camera | ||
| arv.c | ||
| coda.c | ||
| coda.h | ||
| fsl-viu.c | ||
| indycam.c | ||
| indycam.h | ||
| Kconfig | ||
| m2m-deinterlace.c | ||
| Makefile | ||
| mem2mem_testdev.c | ||
| mx2_emmaprp.c | ||
| omap24xxcam-dma.c | ||
| omap24xxcam.c | ||
| omap24xxcam.h | ||
| sh_vou.c | ||
| timblogiw.c | ||
| via-camera.c | ||
| via-camera.h | ||
| vino.c | ||
| vino.h | ||
| vivi.c | ||