diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /include/linux/dvb/audio.h | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/dvb/audio.h')
| -rw-r--r-- | include/linux/dvb/audio.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index 89412e18f571..bb0df2aaebfa 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h | |||
| @@ -24,12 +24,7 @@ | |||
| 24 | #ifndef _DVBAUDIO_H_ | 24 | #ifndef _DVBAUDIO_H_ |
| 25 | #define _DVBAUDIO_H_ | 25 | #define _DVBAUDIO_H_ |
| 26 | 26 | ||
| 27 | #ifdef __KERNEL__ | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #else | ||
| 30 | #include <stdint.h> | ||
| 31 | #endif | ||
| 32 | |||
| 33 | 28 | ||
| 34 | typedef enum { | 29 | typedef enum { |
| 35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ | 30 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ |