From 75fb1866f52dae0fc5774cdd8fe5a909bbf74381 Mon Sep 17 00:00:00 2001 From: Tobias Lorenz Date: Sat, 8 Jan 2011 16:13:04 -0300 Subject: [PATCH] --- yaml --- r: 232191 b: refs/heads/master c: 186a21cb77ffe23397aaea302ab32b510b3e2df4 h: refs/heads/master i: 232189: 13bc713264591882ccc6f78b6ed6b78a9376391d 232187: 35c9ab6ccf001b487ffa5646021bc97e52f337a3 232183: 0a0b76e01031406ab24a7d05c50191d3de7f0c71 232175: ed652816f9ff07a44178623b10b6a1d8a0842c79 232159: 102b97ca10db6264372ed917ecc4ca4b1ce7ef07 232127: b9363e85b5a2c9568b4ad7faf9686969ec66cb9b 232063: 3d391049d6884d8809c8920b083746ce062d9f16 231935: 4a03a5f169e1c73ca055a1eb2135a5a24cde88a9 v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/si470x/radio-si470x-common.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d10f1aa1f4fc..d75de2b74e75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 131ddd1a3072aebca666767151acaa7574beb583 +refs/heads/master: 186a21cb77ffe23397aaea302ab32b510b3e2df4 diff --git a/trunk/drivers/media/radio/si470x/radio-si470x-common.c b/trunk/drivers/media/radio/si470x/radio-si470x-common.c index 35488baf29bd..60c176fe328e 100644 --- a/trunk/drivers/media/radio/si470x/radio-si470x-common.c +++ b/trunk/drivers/media/radio/si470x/radio-si470x-common.c @@ -688,12 +688,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, /* driver constants */ strcpy(tuner->name, "FM"); tuner->type = V4L2_TUNER_RADIO; -#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO; -#else - tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; -#endif /* range limits */ switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) { @@ -719,12 +715,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, tuner->rxsubchans = V4L2_TUNER_SUB_MONO; else tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; -#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) /* If there is a reliable method of detecting an RDS channel, then this code should check for that before setting this RDS subchannel. */ tuner->rxsubchans |= V4L2_TUNER_SUB_RDS; -#endif /* mono/stereo selector */ if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)