From 833673e71b899b256d04df05b329f6fbb8d6c354 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Date: Thu, 29 Nov 2012 16:45:07 -0300
Subject: [PATCH] --- yaml --- r: 357175 b: refs/heads/master c:
 9d193b758edaad192d05ebcb8dc4cb72711bf618 h: refs/heads/master i:   357173:
 0101c0776e14365e3df25a35c88d4d9454b86903   357171:
 84e48ad62ae7e8b0dd9ae618a91c1df61275df2b   357167:
 fe6e7a562ce6d192cab473186f162ef972c195d5 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/platform/s5p-fimc/mipi-csis.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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];
 };