diff --git a/[refs] b/[refs]
index 63042ebcdcbe..2da29a8cb53b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea48c13ad0e5626b827bd7076c22df1a352e3983
+refs/heads/master: f69d419a0bdf4cd2551200b6777a226fea527d1a
diff --git a/trunk/drivers/media/video/m52790.c b/trunk/drivers/media/video/m52790.c
index 4d2a52204ad4..d4bf14c284ef 100644
--- a/trunk/drivers/media/video/m52790.c
+++ b/trunk/drivers/media/video/m52790.c
@@ -30,7 +30,7 @@
 #include <media/m52790.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
 MODULE_AUTHOR("Hans Verkuil");
diff --git a/trunk/drivers/media/video/saa7127.c b/trunk/drivers/media/video/saa7127.c
index a5fbfe025333..b146eedfc7a6 100644
--- a/trunk/drivers/media/video/saa7127.c
+++ b/trunk/drivers/media/video/saa7127.c
@@ -55,7 +55,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/saa7127.h>
 
 static int debug = 0;
diff --git a/trunk/drivers/media/video/upd64031a.c b/trunk/drivers/media/video/upd64031a.c
index 1b162f2dca95..bc8db9943b77 100644
--- a/trunk/drivers/media/video/upd64031a.c
+++ b/trunk/drivers/media/video/upd64031a.c
@@ -28,7 +28,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/upd64031a.h>
 
 // --------------------- read registers functions define -----------------------
diff --git a/trunk/drivers/media/video/upd64083.c b/trunk/drivers/media/video/upd64083.c
index 0f9e86cfc628..d467cc34ac4d 100644
--- a/trunk/drivers/media/video/upd64083.c
+++ b/trunk/drivers/media/video/upd64083.c
@@ -27,7 +27,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/upd64083.h>
 
 MODULE_DESCRIPTION("uPD64083 driver");
diff --git a/trunk/drivers/media/video/vp27smpx.c b/trunk/drivers/media/video/vp27smpx.c
index cd98084ac090..2d97914d3092 100644
--- a/trunk/drivers/media/video/vp27smpx.c
+++ b/trunk/drivers/media/video/vp27smpx.c
@@ -30,7 +30,7 @@
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("vp27smpx driver");
 MODULE_AUTHOR("Hans Verkuil");
diff --git a/trunk/drivers/media/video/wm8739.c b/trunk/drivers/media/video/wm8739.c
index 1c30a5c8455c..31795b4f8b63 100644
--- a/trunk/drivers/media/video/wm8739.c
+++ b/trunk/drivers/media/video/wm8739.c
@@ -30,7 +30,7 @@
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("wm8739 driver");
 MODULE_AUTHOR("T. Adachi, Hans Verkuil");