diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /drivers/media/platform/omap/omap_vout.c | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'drivers/media/platform/omap/omap_vout.c')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index a3b1a34c896d..4b1becc86e54 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
| @@ -45,8 +45,8 @@ | |||
| 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 <video/omapvrfb.h> |
| 50 | #include <video/omapdss.h> | 50 | #include <video/omapdss.h> |
| 51 | 51 | ||
| 52 | #include "omap_voutlib.h" | 52 | #include "omap_voutlib.h" |