diff --git a/[refs] b/[refs]
index 54390f81c6e2..8621a18902e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94a2e47379dd647e4391a5ec9db1301b48b3e76
+refs/heads/master: f748b65bfc8cabdf50f1a6934a9cd43f173f2264
diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.h b/trunk/drivers/staging/dt3155v4l/dt3155v4l.h
index b0792b3d9b76..c064ebac3189 100644
--- a/trunk/drivers/staging/dt3155v4l/dt3155v4l.h
+++ b/trunk/drivers/staging/dt3155v4l/dt3155v4l.h
@@ -204,7 +204,7 @@ struct dt3155_priv {
 	spinlock_t lock;
 	unsigned int field_count;
 	struct dt3155_stats stats;
-	void *regs;
+	void __iomem *regs;
 	int users;
 	u8 csr2, config;
 };