lguest: fix ugly <NULL> in /proc/interrupts

[linux-2.6-omap-h63xx.git] / include / linux / dvb / dmx.h

diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index 263e9e19f772eebfee72d9735e6180b6d18a1711..402fb7a8d922531809a2b19a4ec1d590587e578f 100644 (file)
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -38,10 +38,11 @@ typedef enum
 {
        DMX_OUT_DECODER, /* Streaming directly to decoder. */
        DMX_OUT_TAP,     /* Output going to a memory buffer */
-                        /* (to be retrieved via the read command).*/
-       DMX_OUT_TS_TAP   /* Output multiplexed into a new TS  */
-                        /* (to be retrieved by reading from the */
-                        /* logical DVR device).                 */
+                        /* (to be retrieved via the read command).*/
+       DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
+                        /* (to be retrieved by reading from the */
+                        /* logical DVR device).                 */
+       DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
 } dmx_output_t;
 
 
@@ -88,20 +89,6 @@ typedef enum
 #define DMX_PES_PCR      DMX_PES_PCR0
 
 
-typedef enum
-{
-       DMX_SCRAMBLING_EV,
-       DMX_FRONTEND_EV
-} dmx_event_t;
-
-
-typedef enum
-{
-       DMX_SCRAMBLING_OFF,
-       DMX_SCRAMBLING_ON
-} dmx_scrambling_status_t;
-
-
 typedef struct dmx_filter
 {
        __u8  filter[DMX_FILTER_SIZE];
@@ -132,17 +119,6 @@ struct dmx_pes_filter_params
        __u32          flags;
 };
 
-
-struct dmx_event
-{
-       dmx_event_t         event;
-       time_t              timeStamp;
-       union
-       {
-               dmx_scrambling_status_t scrambling;
-       } u;
-};
-
 typedef struct dmx_caps {
        __u32 caps;
        int num_decoders;
@@ -171,7 +147,6 @@ struct dmx_stc {
 #define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)
 #define DMX_SET_PES_FILTER       _IOW('o', 44, struct dmx_pes_filter_params)
 #define DMX_SET_BUFFER_SIZE      _IO('o', 45)
-#define DMX_GET_EVENT            _IOR('o', 46, struct dmx_event)
 #define DMX_GET_PES_PIDS         _IOR('o', 47, __u16[5])
 #define DMX_GET_CAPS             _IOR('o', 48, dmx_caps_t)
 #define DMX_SET_SOURCE           _IOW('o', 49, dmx_source_t)