These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / uapi / linux / dvb / dmx.h

diff --git a/kernel/include/uapi/linux/dvb/dmx.h b/kernel/include/uapi/linux/dvb/dmx.h
index b4fb650..427e489 100644 (file)
--- a/kernel/include/uapi/linux/dvb/dmx.h
+++ b/kernel/include/uapi/linux/dvb/dmx.h
@@ -32,7 +32,7 @@
 
 #define DMX_FILTER_SIZE 16
 
-typedef enum
+enum dmx_output
 {
        DMX_OUT_DECODER, /* Streaming directly to decoder. */
        DMX_OUT_TAP,     /* Output going to a memory buffer */
@@ -41,10 +41,11 @@ typedef enum
                         /* (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;
+};
 
+typedef enum dmx_output dmx_output_t;
 
-typedef enum
+typedef enum dmx_input
 {
        DMX_IN_FRONTEND, /* Input from a front-end device.  */
        DMX_IN_DVR       /* Input from the logical DVR device.  */
@@ -122,7 +123,7 @@ typedef struct dmx_caps {
        int num_decoders;
 } dmx_caps_t;
 
-typedef enum {
+typedef enum dmx_source {
        DMX_SOURCE_FRONT0 = 0,
        DMX_SOURCE_FRONT1,
        DMX_SOURCE_FRONT2,
@@ -139,7 +140,6 @@ struct dmx_stc {
        __u64 stc;              /* output: stc in 'base'*90 kHz units */
 };
 
-
 #define DMX_START                _IO('o', 41)
 #define DMX_STOP                 _IO('o', 42)
 #define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)