diff --git a/[refs] b/[refs]
index d2f0a7ff732d..073be63d251b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d193b758edaad192d05ebcb8dc4cb72711bf618
+refs/heads/master: a75831f3600c479054fc3f70cd11257ab07886e2
diff --git a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.h b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.h
index 022b9b9baff9..8a4013e3aee7 100644
--- a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.h
+++ b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.h
@@ -62,7 +62,7 @@
  */
 struct s5p_jpeg {
 	struct mutex		lock;
-	struct spinlock		slock;
+	spinlock_t		slock;
 
 	struct v4l2_device	v4l2_dev;
 	struct video_device	*vfd_encoder;