diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:35:54 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:35:54 -0400 |
| commit | a6b5825aa703714523a745a8e050b9d6105f6704 (patch) | |
| tree | 1d5939799cfece8200f832f423fbb7fb57cc54b9 /drivers/media | |
| parent | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (diff) | |
| parent | 0d66cbb53eca4ab3db85d9189d5a85c9fac49b84 (diff) | |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/omap/omap_voutdef.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index d4fe7bc92a1d..4ada9be1d430 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <plat/dma.h> | 47 | #include <plat/dma.h> |
| 48 | #include <plat/vram.h> | 48 | #include <plat/vram.h> |
| 49 | #include <plat/vrfb.h> | 49 | #include <plat/vrfb.h> |
| 50 | #include <plat/display.h> | 50 | #include <video/omapdss.h> |
| 51 | 51 | ||
| 52 | #include "omap_voutlib.h" | 52 | #include "omap_voutlib.h" |
| 53 | #include "omap_voutdef.h" | 53 | #include "omap_voutdef.h" |
diff --git a/drivers/media/video/omap/omap_voutdef.h b/drivers/media/video/omap/omap_voutdef.h index ea3a047f8bca..659497b84996 100644 --- a/drivers/media/video/omap/omap_voutdef.h +++ b/drivers/media/video/omap/omap_voutdef.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef OMAP_VOUTDEF_H | 11 | #ifndef OMAP_VOUTDEF_H |
| 12 | #define OMAP_VOUTDEF_H | 12 | #define OMAP_VOUTDEF_H |
| 13 | 13 | ||
| 14 | #include <plat/display.h> | 14 | #include <video/omapdss.h> |
| 15 | 15 | ||
| 16 | #define YUYV_BPP 2 | 16 | #define YUYV_BPP 2 |
| 17 | #define RGB565_BPP 2 | 17 | #define RGB565_BPP 2 |