---

yaml --- r: 357176 b: refs/heads/master c: a75831f h: refs/heads/master v: v3
git-mirror · Dec 27, 2012 · 31cac87 · 31cac87
1 parent 833673e
commit 31cac87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;