From a097cbe9362c3c8569eeef693aa2636098ed9d8f Mon Sep 17 00:00:00 2001
From: Kamil Debski <k.debski@samsung.com>
Date: Tue, 27 Dec 2011 10:07:24 -0300
Subject: [PATCH] --- yaml --- r: 286424 b: refs/heads/master c:
 0da0a7833824b51488b81db002bb47ad8688f9bb h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5114247562f5..b0ed39ca656a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb869368f36abecc427ffa94193439a05c0aac8d
+refs/heads/master: 0da0a7833824b51488b81db002bb47ad8688f9bb
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index 844a4d7797bc..c25ec022d267 100644
--- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -165,7 +165,7 @@ static struct mfc_control controls[] = {
 		.maximum = 32,
 		.step = 1,
 		.default_value = 1,
-		.flags = V4L2_CTRL_FLAG_VOLATILE,
+		.is_volatile = 1,
 	},
 };