Merge branch 'x86/paravirt' into x86/apic

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

diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
index 0874a67c6b922de7e5ab9e81ac2fda4907a96135..bb0df2aaebfa8676c029f13d58ff35fd48709166 100644 (file)
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -24,12 +24,7 @@
 #ifndef _DVBAUDIO_H_
 #define _DVBAUDIO_H_
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
-
 
 typedef enum {
        AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
@@ -47,7 +42,9 @@ typedef enum {
 typedef enum {
        AUDIO_STEREO,
        AUDIO_MONO_LEFT,
-       AUDIO_MONO_RIGHT
+       AUDIO_MONO_RIGHT,
+       AUDIO_MONO,
+       AUDIO_STEREO_SWAPPED
 } audio_channel_select_t;
 
 
@@ -133,5 +130,6 @@ typedef uint16_t audio_attributes_t;
  * extracted by the PES parser.
  */
 #define AUDIO_GET_PTS              _IOR('o', 19, __u64)
+#define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20)
 
 #endif /* _DVBAUDIO_H_ */