diff --git a/[refs] b/[refs]
index e9f55a6451aa..9a210f6116a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 260a8f7b06c9f8fba20bea7cd76281a533241076
+refs/heads/master: db38951cce88eae36909143291545a59db4efa59
diff --git a/trunk/drivers/media/video/davinci/vpif.h b/trunk/drivers/media/video/davinci/vpif.h
index 25036cb11bea..8bcac65f9294 100644
--- a/trunk/drivers/media/video/davinci/vpif.h
+++ b/trunk/drivers/media/video/davinci/vpif.h
@@ -18,8 +18,6 @@
 
 #include <linux/io.h>
 #include <linux/videodev2.h>
-#include <mach/hardware.h>
-#include <mach/dm646x.h>
 #include <media/davinci/vpif_types.h>
 
 /* Maximum channel allowed */
diff --git a/trunk/drivers/media/video/davinci/vpif_display.c b/trunk/drivers/media/video/davinci/vpif_display.c
index 286f02910044..7fa34b4fae26 100644
--- a/trunk/drivers/media/video/davinci/vpif_display.c
+++ b/trunk/drivers/media/video/davinci/vpif_display.c
@@ -39,8 +39,6 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-chip-ident.h>
 
-#include <mach/dm646x.h>
-
 #include "vpif_display.h"
 #include "vpif.h"
 
diff --git a/trunk/include/media/davinci/vpif_types.h b/trunk/include/media/davinci/vpif_types.h
index 9929b05cff3a..bd8217c2577c 100644
--- a/trunk/include/media/davinci/vpif_types.h
+++ b/trunk/include/media/davinci/vpif_types.h
@@ -17,6 +17,8 @@
 #ifndef _VPIF_TYPES_H
 #define _VPIF_TYPES_H
 
+#include <linux/i2c.h>
+
 #define VPIF_CAPTURE_MAX_CHANNELS	2
 
 enum vpif_if_type {