diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 12:51:57 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 12:51:57 -0400 |
| commit | 1d81aea146c1236c8d6b90574eb3b7d59e02cdbf (patch) | |
| tree | 35a7b875c4b833aa271f6599d211e7e9e6dccadd /drivers/media/platform/omap | |
| parent | 35f70935c64ae229ebd1fc65398ec68d4d803712 (diff) | |
| parent | a89d1a87ad80277939c7fcfb8484f0b110d264ef (diff) | |
Merge remote-tracking branch 'tomi/3.8/vrfb-conversion' into omap-for-v3.8/cleanup-headers-dss
Diffstat (limited to 'drivers/media/platform/omap')
| -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 a3b1a34c896d..3ff94a30fde4 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
| 48 | #include <plat/dma.h> | 48 | #include <plat/dma.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" |
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 4be26abf6cea..6c37f9240ddf 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <media/v4l2-device.h> | 17 | #include <media/v4l2-device.h> |
| 18 | 18 | ||
| 19 | #include <plat/dma.h> | 19 | #include <plat/dma.h> |
| 20 | #include <plat/vrfb.h> | 20 | #include <video/omapvrfb.h> |
| 21 | 21 | ||
| 22 | #include "omap_voutdef.h" | 22 | #include "omap_voutdef.h" |
| 23 | #include "omap_voutlib.h" | 23 | #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 @@ | |||
| 12 | #define OMAP_VOUTDEF_H | 12 | #define OMAP_VOUTDEF_H |
| 13 | 13 | ||
| 14 | #include <video/omapdss.h> | 14 | #include <video/omapdss.h> |
| 15 | #include <plat/vrfb.h> | 15 | #include <video/omapvrfb.h> |
| 16 | 16 | ||
| 17 | #define YUYV_BPP 2 | 17 | #define YUYV_BPP 2 |
| 18 | #define RGB565_BPP 2 | 18 | #define RGB565_BPP 2 |