From 7b01a4c567b84ba6b1b60c4322c545e0c24da6f1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 22 May 2006 10:31:52 -0300
Subject: [PATCH] --- yaml --- r: 29945 b: refs/heads/master c:
 d762052e1eafd95f3b4622e1990f40dfd0d45b0f h: refs/heads/master i:   29943:
 f67b6a98ae6722698ad31fa7a294acebc59e16f7 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/pwc/pwc-v4l.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 941a3c34b4f6..d90f4293fdd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6320bd3df5964619346bac77b36d03c5a82f6fd
+refs/heads/master: d762052e1eafd95f3b4622e1990f40dfd0d45b0f
diff --git a/trunk/drivers/media/video/pwc/pwc-v4l.c b/trunk/drivers/media/video/pwc/pwc-v4l.c
index 68e7573c8ef2..ebf0a92b3956 100644
--- a/trunk/drivers/media/video/pwc/pwc-v4l.c
+++ b/trunk/drivers/media/video/pwc/pwc-v4l.c
@@ -127,7 +127,6 @@ static struct v4l2_queryctrl pwc_controls[] = {
 	    .step    = 1,
 	    .default_value = 0,
 	},
-#if XAWTV_HAS_BEEN_FIXED
 	{
 	    .id      = V4L2_CID_PRIVATE_SAVE_USER,
 	    .type    = V4L2_CTRL_TYPE_BUTTON,
@@ -209,7 +208,6 @@ static struct v4l2_queryctrl pwc_controls[] = {
 	    .step    = 1,
 	    .default_value = 0,
 	},
-#endif
 };
 
 #if CONFIG_PWC_DEBUG