--- a/include/linux/dvb/video.h	Thu Apr 09 12:06:38 2009 +0200
+++ b/include/linux/dvb/video.h	Thu Apr 09 12:07:21 2009 +0200
@@ -24,17 +24,14 @@
 #ifndef _DVBVIDEO_H_
 #define _DVBVIDEO_H_
 
-#include <linux/compiler.h>
-
+#include <linux/types.h>
 #ifdef __KERNEL__
-#include <linux/types.h>
+#include <linux/compiler.h>
 #else
-#include <asm/types.h>
 #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. */