From 19a5ec13592b9acdc5571bbc2b7175ca8e4b4f3d Mon Sep 17 00:00:00 2001
From: Alexey Klimov <klimov.linux@gmail.com>
Date: Sat, 8 Nov 2008 00:31:50 -0300
Subject: [PATCH] --- yaml --- r: 124168 b: refs/heads/master c:
 54b7b0deb4c602d0751627d14510dc50b5bba372 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/radio/dsbr100.c | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 67160baf432e..04890f36bc8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04e0ffbbdd297fac1d8a5696b5d27887d6ff3dc2
+refs/heads/master: 54b7b0deb4c602d0751627d14510dc50b5bba372
diff --git a/trunk/drivers/media/radio/dsbr100.c b/trunk/drivers/media/radio/dsbr100.c
index e6485cfe1218..eafa547ca96b 100644
--- a/trunk/drivers/media/radio/dsbr100.c
+++ b/trunk/drivers/media/radio/dsbr100.c
@@ -93,8 +93,8 @@
  */
 #include <linux/version.h>	/* for KERNEL_VERSION MACRO	*/
 
-#define DRIVER_VERSION "v0.41"
-#define RADIO_VERSION KERNEL_VERSION(0,4,1)
+#define DRIVER_VERSION "v0.43"
+#define RADIO_VERSION KERNEL_VERSION(0, 4, 3)
 
 static struct v4l2_queryctrl radio_qctrl[] = {
 	{
@@ -104,7 +104,27 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 		.maximum       = 1,
 		.default_value = 1,
 		.type          = V4L2_CTRL_TYPE_BOOLEAN,
-	}
+	},
+/* HINT: the disabled controls are only here to satify kradio and such apps */
+	{       .id             = V4L2_CID_AUDIO_VOLUME,
+		.flags          = V4L2_CTRL_FLAG_DISABLED,
+	},
+	{
+		.id             = V4L2_CID_AUDIO_BALANCE,
+		.flags          = V4L2_CTRL_FLAG_DISABLED,
+	},
+	{
+		.id             = V4L2_CID_AUDIO_BASS,
+		.flags          = V4L2_CTRL_FLAG_DISABLED,
+	},
+	{
+		.id             = V4L2_CID_AUDIO_TREBLE,
+		.flags          = V4L2_CTRL_FLAG_DISABLED,
+	},
+	{
+		.id             = V4L2_CID_AUDIO_LOUDNESS,
+		.flags          = V4L2_CTRL_FLAG_DISABLED,
+	},
 };
 
 #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"