This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / dvb / frontend.h

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index fd0bc53..51a69e3 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -32,8 +32,7 @@
 typedef enum fe_type {
         FE_QPSK,
         FE_QAM,
-       FE_OFDM,
-       FE_ATSC
+        FE_OFDM
 } fe_type_t;
 
 
@@ -60,9 +59,7 @@ typedef enum fe_caps {
        FE_CAN_BANDWIDTH_AUTO         = 0x40000,
        FE_CAN_GUARD_INTERVAL_AUTO    = 0x80000,
        FE_CAN_HIERARCHY_AUTO         = 0x100000,
-       FE_CAN_8VSB                     = 0x200000,
-       FE_CAN_16VSB                    = 0x400000,
-       FE_NEEDS_BENDING                = 0x20000000, // not supported anymore, don't use (frontend requires frequency bending)
+       FE_NEEDS_BENDING              = 0x20000000, // frontend requires frequency bending
        FE_CAN_RECOVER                = 0x40000000, // frontend can recover from a cable unplug automatically
        FE_CAN_MUTE_TS                = 0x80000000  // frontend can stop spurious TS data output
 } fe_caps_t;
@@ -78,7 +75,7 @@ struct dvb_frontend_info {
        __u32      symbol_rate_min;
         __u32      symbol_rate_max;
        __u32      symbol_rate_tolerance;     /* ppm */
-       __u32      notifier_delay;              /* DEPRECATED */
+       __u32      notifier_delay;            /* ms */
        fe_caps_t  caps;
 };
 
@@ -258,8 +255,6 @@ struct dvb_frontend_event {
 #define FE_GET_FRONTEND            _IOR('o', 77, struct dvb_frontend_parameters)
 #define FE_GET_EVENT               _IOR('o', 78, struct dvb_frontend_event)
 
-#define FE_DISHNETWORK_SEND_LEGACY_CMD _IO('o', 80) /* unsigned int */
-
 
 #endif /*_DVBFRONTEND_H_*/