From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 22 May 2006 13:31:52 +0000 (-0300)
Subject: V4L/DVB (3968): Fix checking logic for a broken xawtv version
X-Git-Tag: v2.6.18-rc1~862^2~132
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d762052e1eafd95f3b4622e1990f40dfd0d45b0f;p=linux-2.6

V4L/DVB (3968): Fix checking logic for a broken xawtv version

moved from if to ifndef.
Also added such tests at gentree script. Gentree updated to its latest
version.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 68e7573c8e..ebf0a92b39 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/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