diff --git a/[refs] b/[refs] index 4954bd967bb0..31d86e0dd16f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d6aa4c7ece26652fcbfe37bd45679eac5f69347 +refs/heads/master: 15cf98ad2965aaefaa2f85332535ff39e48f9f4e diff --git a/trunk/include/linux/dvb/audio.h b/trunk/include/linux/dvb/audio.h index 89412e18f571..bb0df2aaebfa 100644 --- a/trunk/include/linux/dvb/audio.h +++ b/trunk/include/linux/dvb/audio.h @@ -24,12 +24,7 @@ #ifndef _DVBAUDIO_H_ #define _DVBAUDIO_H_ -#ifdef __KERNEL__ #include -#else -#include -#endif - typedef enum { AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */