From de0ed6a4a0799495f5383af37265cbb6feb3e5fd Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Fri, 30 Jan 2009 19:59:53 +0530
Subject: [PATCH] --- yaml --- r: 130612 b: refs/heads/master c:
 b852d36b86902abb272b0f2dd7a56dd2d17ea88c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/dvb/video.h | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 129a108dd6dd..c02c1a0db1db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8996be9de98a9362a3192b866dd8ab9930e28ad9
+refs/heads/master: b852d36b86902abb272b0f2dd7a56dd2d17ea88c
diff --git a/trunk/include/linux/dvb/video.h b/trunk/include/linux/dvb/video.h
index 50839fe9e39e..bd49c3ebf916 100644
--- a/trunk/include/linux/dvb/video.h
+++ b/trunk/include/linux/dvb/video.h
@@ -24,17 +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 <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. */