diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-01 06:47:21 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-01 06:47:21 +0100 |
| commit | 48d224d1efec98b0b78e511150b4f5752beceb7c (patch) | |
| tree | 6777113a72a73fdf4e8d84f7447c32b25fa902a9 /drivers/media | |
| parent | Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (diff) | |
| download | linux-48d224d1efec98b0b78e511150b4f5752beceb7c.tar.xz linux-48d224d1efec98b0b78e511150b4f5752beceb7c.zip | |
Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm2
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispstat.h | 2 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 4b1becc86e54..993504015963 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -45,7 +45,7 @@ #include <media/v4l2-ioctl.h> #include <plat/cpu.h> -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> #include <video/omapvrfb.h> #include <video/omapdss.h> diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 8340445a0ee5..cf1c437a8687 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c @@ -16,7 +16,7 @@ #include <media/videobuf-dma-contig.h> #include <media/v4l2-device.h> -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> #include <video/omapvrfb.h> #include "omap_voutdef.h" diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h index 40f87cdd7994..bb363742bd1c 100644 --- a/drivers/media/platform/omap3isp/ispstat.h +++ b/drivers/media/platform/omap3isp/ispstat.h @@ -30,7 +30,7 @@ #include <linux/types.h> #include <linux/omap3isp.h> -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> #include <media/v4l2-event.h> #include "isp.h" diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index cae9ce6275e9..611595f1a75e 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c @@ -34,7 +34,7 @@ #include <media/videobuf-dma-contig.h> #include <media/videobuf-dma-sg.h> -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> #define DRIVER_NAME "omap1-camera" |