diff --git a/[refs] b/[refs]
index 18d8e0bf3030..d2f0a7ff732d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26711113c4e4e72a72d347bfc33590595f248df7
+refs/heads/master: 9d193b758edaad192d05ebcb8dc4cb72711bf618
diff --git a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
index 8a06f1402f37..076c29bd41c8 100644
--- a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -187,7 +187,7 @@ struct csis_state {
 	const struct csis_pix_format *csis_fmt;
 	struct v4l2_mbus_framefmt format;
 
-	struct spinlock slock;
+	spinlock_t slock;
 	struct csis_pktbuf pkt_buf;
 	struct s5pcsis_event events[S5PCSIS_NUM_EVENTS];
 };