diff --git a/[refs] b/[refs]
index e501c6c8a6b7..b77d4098b571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: fb029093e7408efa177e80444199746638c7d79d
+refs/heads/master: ab94782213835f90f5def384ee75e171c0bfd100
diff --git a/trunk/Documentation/DocBook/media/dvb/demux.xml b/trunk/Documentation/DocBook/media/dvb/demux.xml
index a297f0aadd0a..6758739cd611 100644
--- a/trunk/Documentation/DocBook/media/dvb/demux.xml
+++ b/trunk/Documentation/DocBook/media/dvb/demux.xml
@@ -135,17 +135,42 @@ struct dmx_pes_filter_params
struct dmx_stc
-
+
struct dmx_stc {
unsigned int num; /⋆ input : which STC? 0..N ⋆/
unsigned int base; /⋆ output: divisor for stc to get 90 kHz clock ⋆/
__u64 stc; /⋆ output: stc in 'base'⋆90 kHz units ⋆/
};
-
+
+
+
+struct dmx_caps
+
+ typedef struct dmx_caps {
+ __u32 caps;
+ int num_decoders;
+} dmx_caps_t;
+
+
+
+enum dmx_source_t
+
+typedef enum {
+ DMX_SOURCE_FRONT0 = 0,
+ DMX_SOURCE_FRONT1,
+ DMX_SOURCE_FRONT2,
+ DMX_SOURCE_FRONT3,
+ DMX_SOURCE_DVR0 = 16,
+ DMX_SOURCE_DVR1,
+ DMX_SOURCE_DVR2,
+ DMX_SOURCE_DVR3
+} dmx_source_t;
+
+