From 0d2b5cd5bf4191fa3ebd32d43c58f8a123a47df7 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Fri, 26 Sep 2008 00:29:49 -0300
Subject: [PATCH] --- yaml --- r: 114023 b: refs/heads/master c:
 eacf8d8d6bc6798f6870a2cf2c159bfcde3759ac h: refs/heads/master i:   114021:
 98ae55791ad48a9b04f86a8a1faed9331cf1f572   114019:
 d28310fd50f142ed1d940edb91fb7b3df83a4de9   114015:
 ba79ebc18aaec7788a4fb4491941e6755526fd3b v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 9 +++++++++
 trunk/include/linux/dvb/frontend.h              | 1 +
 trunk/include/linux/dvb/version.h               | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3aaf2becfc2f..b4b96496b62c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d48cb402a1ba48c4ad4a36c3c561386027318459
+refs/heads/master: eacf8d8d6bc6798f6870a2cf2c159bfcde3759ac
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
index 0ef9c2a2af87..4c3f0d7e355c 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -40,6 +40,7 @@
 
 #include "dvb_frontend.h"
 #include "dvbdev.h"
+#include <linux/dvb/version.h>
 
 static int dvb_frontend_debug;
 static int dvb_shutdown_timeout;
@@ -836,6 +837,11 @@ struct dtv_cmds_h dtv_cmds[] = {
 		.set	= 0,
 		.buffer	= 1,
 	},
+	[DTV_API_VERSION] = {
+		.name	= "DTV_API_VERSION",
+		.cmd	= DTV_API_VERSION,
+		.set	= 0,
+	},
 };
 
 void dtv_property_dump(struct dtv_property *tvp)
@@ -1104,6 +1110,9 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,
 	case DTV_TONE:
 		tvp->u.data = fe->dtv_property_cache.sectone;
 		break;
+	case DTV_API_VERSION:
+		tvp->u.data = (DVB_API_VERSION << 8) | DVB_API_VERSION_MINOR;
+		break;
 	default:
 		r = -1;
 	}
diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h
index b561626fc8a0..eb98f8c37cad 100644
--- a/trunk/include/linux/dvb/frontend.h
+++ b/trunk/include/linux/dvb/frontend.h
@@ -268,6 +268,7 @@ struct dvb_frontend_event {
 #define DTV_FE_CAPABILITY	16
 #define DTV_DELIVERY_SYSTEM	17
 
+#define DTV_API_VERSION				35
 
 typedef enum fe_pilot {
 	PILOT_ON,
diff --git a/trunk/include/linux/dvb/version.h b/trunk/include/linux/dvb/version.h
index 126e0c26cb09..25b823b81734 100644
--- a/trunk/include/linux/dvb/version.h
+++ b/trunk/include/linux/dvb/version.h
@@ -23,7 +23,7 @@
 #ifndef _DVBVERSION_H_
 #define _DVBVERSION_H_
 
-#define DVB_API_VERSION 3
-#define DVB_API_VERSION_MINOR 2
+#define DVB_API_VERSION 5
+#define DVB_API_VERSION_MINOR 0
 
 #endif /*_DVBVERSION_H_*/