diff options
-rw-r--r-- | drivers/media/video/davinci/vpif.h | 2 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpif_display.c | 2 | ||||
-rw-r--r-- | include/media/davinci/vpif_types.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h index 25036cb11bea..8bcac65f9294 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/video/davinci/vpif.h | |||
@@ -18,8 +18,6 @@ | |||
18 | 18 | ||
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/videodev2.h> | 20 | #include <linux/videodev2.h> |
21 | #include <mach/hardware.h> | ||
22 | #include <mach/dm646x.h> | ||
23 | #include <media/davinci/vpif_types.h> | 21 | #include <media/davinci/vpif_types.h> |
24 | 22 | ||
25 | /* Maximum channel allowed */ | 23 | /* Maximum channel allowed */ |
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index 286f02910044..7fa34b4fae26 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c | |||
@@ -39,8 +39,6 @@ | |||
39 | #include <media/v4l2-ioctl.h> | 39 | #include <media/v4l2-ioctl.h> |
40 | #include <media/v4l2-chip-ident.h> | 40 | #include <media/v4l2-chip-ident.h> |
41 | 41 | ||
42 | #include <mach/dm646x.h> | ||
43 | |||
44 | #include "vpif_display.h" | 42 | #include "vpif_display.h" |
45 | #include "vpif.h" | 43 | #include "vpif.h" |
46 | 44 | ||
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h index 9929b05cff3a..bd8217c2577c 100644 --- a/include/media/davinci/vpif_types.h +++ b/include/media/davinci/vpif_types.h | |||
@@ -17,6 +17,8 @@ | |||
17 | #ifndef _VPIF_TYPES_H | 17 | #ifndef _VPIF_TYPES_H |
18 | #define _VPIF_TYPES_H | 18 | #define _VPIF_TYPES_H |
19 | 19 | ||
20 | #include <linux/i2c.h> | ||
21 | |||
20 | #define VPIF_CAPTURE_MAX_CHANNELS 2 | 22 | #define VPIF_CAPTURE_MAX_CHANNELS 2 |
21 | 23 | ||
22 | enum vpif_if_type { | 24 | enum vpif_if_type { |