Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

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

diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 93e4c3a6d1903239a3250c06c0cd1b7df007d36a..bd49c3ebf916daef78fd00eb8a600619f162100d 100644 (file)
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -24,16 +24,14 @@
 #ifndef _DVBVIDEO_H_
 #define _DVBVIDEO_H_
 
-#include <linux/compiler.h>
-
-#ifdef __KERNEL__
 #include <linux/types.h>
+#ifdef __KERNEL__
+#include <linux/compiler.h>
 #else
 #include <stdint.h>
 #include <time.h>
 #endif
 
-
 typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */