diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-16 14:20:49 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-16 14:20:49 +0000 |
| commit | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (patch) | |
| tree | db2fac3b2e0cbca0174232ef5ec6c2f166f635cc /drivers/media | |
| parent | 02735a29d8ce882ec698803f064e17888874780c (diff) | |
| parent | e13c692b1f97a6a4f753695b4f28b7f10e5d79ae (diff) | |
Merge branch 'davinci/cleanup' into next/cleanup
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/davinci/vpif.h | 1 | ||||
| -rw-r--r-- | drivers/media/video/davinci/vpif_capture.h | 2 | ||||
| -rw-r--r-- | drivers/media/video/davinci/vpif_display.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h index 10550bd93b0..25036cb11be 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/video/davinci/vpif.h @@ -20,6 +20,7 @@ #include <linux/videodev2.h> #include <mach/hardware.h> #include <mach/dm646x.h> +#include <media/davinci/vpif_types.h> /* Maximum channel allowed */ #define VPIF_NUM_CHANNELS (4) diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h index 064550f5ce4..a693d4ebda5 100644 --- a/drivers/media/video/davinci/vpif_capture.h +++ b/drivers/media/video/davinci/vpif_capture.h @@ -27,7 +27,7 @@ #include <media/v4l2-device.h> #include <media/videobuf-core.h> #include <media/videobuf-dma-contig.h> -#include <mach/dm646x.h> +#include <media/davinci/vpif_types.h> #include "vpif.h" diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h index 5d1936dafed..56879d1a068 100644 --- a/drivers/media/video/davinci/vpif_display.h +++ b/drivers/media/video/davinci/vpif_display.h @@ -22,6 +22,7 @@ #include <media/v4l2-device.h> #include <media/videobuf-core.h> #include <media/videobuf-dma-contig.h> +#include <media/davinci/vpif_types.h> #include "vpif.h" |