diff options
author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-15 17:04:53 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 17:04:53 -0400 |
commit | 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8 (patch) | |
tree | 56f5717067157dec194e547afd986e15cf7163ef /drivers/media | |
parent | d5e7c864f386306587f7f43ed22d48ef7e4050d6 (diff) |
ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h
Move plat/dma.h to plat-omap/dma-omap.h as part of single
zImage work
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 a3b1a34c896d..1bd6a2ec95a3 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <media/v4l2-ioctl.h> | 45 | #include <media/v4l2-ioctl.h> |
46 | 46 | ||
47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
48 | #include <plat/dma.h> | 48 | #include <plat-omap/dma-omap.h> |
49 | #include <plat/vrfb.h> | 49 | #include <plat/vrfb.h> |
50 | #include <video/omapdss.h> | 50 | #include <video/omapdss.h> |
51 | 51 | ||
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 11d7a29b9708..bed4cbb18ef5 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <media/videobuf-dma-contig.h> | 16 | #include <media/videobuf-dma-contig.h> |
17 | #include <media/v4l2-device.h> | 17 | #include <media/v4l2-device.h> |
18 | 18 | ||
19 | #include <plat/dma.h> | 19 | #include <plat-omap/dma-omap.h> |
20 | #include <plat/vrfb.h> | 20 | #include <plat/vrfb.h> |
21 | 21 | ||
22 | #include "omap_voutdef.h" | 22 | #include "omap_voutdef.h" |
diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h index a6fe653eb237..40f87cdd7994 100644 --- a/drivers/media/platform/omap3isp/ispstat.h +++ b/drivers/media/platform/omap3isp/ispstat.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/omap3isp.h> | 32 | #include <linux/omap3isp.h> |
33 | #include <plat/dma.h> | 33 | #include <plat-omap/dma-omap.h> |
34 | #include <media/v4l2-event.h> | 34 | #include <media/v4l2-event.h> |
35 | 35 | ||
36 | #include "isp.h" | 36 | #include "isp.h" |
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index 3046dba91006..cae9ce6275e9 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <media/videobuf-dma-contig.h> | 34 | #include <media/videobuf-dma-contig.h> |
35 | #include <media/videobuf-dma-sg.h> | 35 | #include <media/videobuf-dma-sg.h> |
36 | 36 | ||
37 | #include <plat/dma.h> | 37 | #include <plat-omap/dma-omap.h> |
38 | 38 | ||
39 | 39 | ||
40 | #define DRIVER_NAME "omap1-camera" | 40 | #define DRIVER_NAME "omap1-camera" |