Merge branch 'topic/echoaudio' into for-linus

[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 c6a2353c4e68f2831db0007fcc9d9070da1202ae..fef943738a24d56127516c1abbf863c8e79b5ed0 100644 (file)
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -24,7 +24,7 @@
 #ifndef _DVBDMX_H_
 #define _DVBDMX_H_
 
-#include <asm/types.h>
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/time.h>
 #else
@@ -39,9 +39,10 @@ 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  */
+       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;