diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:21:34 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:21:34 -0700 |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /drivers/media | |
| parent | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (diff) | |
| parent | 3e6ece13d966a20a38ee7adfac452a47455ccd7a (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
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/omap/omap_voutdef.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 1bd6a2ec95a3..4b1becc86e54 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -46,7 +46,7 @@ #include <plat/cpu.h> #include <plat-omap/dma-omap.h> -#include <plat/vrfb.h> +#include <video/omapvrfb.h> #include <video/omapdss.h> #include "omap_voutlib.h" diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index bed4cbb18ef5..8340445a0ee5 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c @@ -17,7 +17,7 @@ #include <media/v4l2-device.h> #include <plat-omap/dma-omap.h> -#include <plat/vrfb.h> +#include <video/omapvrfb.h> #include "omap_voutdef.h" #include "omap_voutlib.h" diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/platform/omap/omap_voutdef.h index 27a95d23b913..9ccfe1f475a4 100644 --- a/drivers/media/platform/omap/omap_voutdef.h +++ b/drivers/media/platform/omap/omap_voutdef.h @@ -12,7 +12,7 @@ #define OMAP_VOUTDEF_H #include <video/omapdss.h> -#include <plat/vrfb.h> +#include <video/omapvrfb.h> #define YUYV_BPP 2 #define RGB565_BPP 2 |