1 files changed, 14 insertions, 5 deletions

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 1b1094c35e4f..cb4428ab81ed 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -72,7 +72,7 @@ typedef enum fe_caps {
 
 struct dvb_frontend_info {
         char       name[128];
-        fe_type_t  type;
+        fe_type_t  type;                        /* DEPRECATED. Use DTV_ENUM_DELSYS instead */
         __u32      frequency_min;
         __u32      frequency_max;
         __u32      frequency_stepsize;
@@ -181,6 +181,7 @@ typedef enum fe_transmit_mode {
         TRANSMISSION_MODE_32K,
 } fe_transmit_mode_t;
 
+#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 typedef enum fe_bandwidth {
         BANDWIDTH_8_MHZ,
         BANDWIDTH_7_MHZ,
@@ -190,7 +191,7 @@ typedef enum fe_bandwidth {
         BANDWIDTH_10_MHZ,
         BANDWIDTH_1_712_MHZ,
 } fe_bandwidth_t;
-
+#endif
 
 typedef enum fe_guard_interval {
         GUARD_INTERVAL_1_32,
@@ -213,6 +214,7 @@ typedef enum fe_hierarchy {
 } fe_hierarchy_t;
 
 
+#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 struct dvb_qpsk_parameters {
         __u32           symbol_rate;  /* symbol rate in Symbols per second */
         fe_code_rate_t  fec_inner;    /* forward error correction (see above) */
@@ -251,11 +253,11 @@ struct dvb_frontend_parameters {
         } u;
 };
 
-
 struct dvb_frontend_event {
         fe_status_t status;
         struct dvb_frontend_parameters parameters;
 };
+#endif
 
 /* S2API Commands */
 #define DTV_UNDEFINED           0
@@ -316,7 +318,9 @@ struct dvb_frontend_event {
 
 #define DTV_DVBT2_PLP_ID        43
 
-#define DTV_MAX_COMMAND                         DTV_DVBT2_PLP_ID
+#define DTV_ENUM_DELSYS         44
+
+#define DTV_MAX_COMMAND                         DTV_ENUM_DELSYS
 
 typedef enum fe_pilot {
         PILOT_ON,
@@ -333,7 +337,7 @@ typedef enum fe_rolloff {
 
 typedef enum fe_delivery_system {
         SYS_UNDEFINED,
-        SYS_DVBC_ANNEX_AC,
+        SYS_DVBC_ANNEX_A,
         SYS_DVBC_ANNEX_B,
         SYS_DVBT,
         SYS_DSS,
@@ -350,8 +354,13 @@ typedef enum fe_delivery_system {
         SYS_DAB,
         SYS_DVBT2,
         SYS_TURBO,
+        SYS_DVBC_ANNEX_C,
 } fe_delivery_system_t;
 
+
+#define SYS_DVBC_ANNEX_AC       SYS_DVBC_ANNEX_A
+
+
 struct dtv_cmds_h {
         char    *name;          /* A display name for debugging purposes */