X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fivtv.h;h=17ca64b5a66cc253f9284e51e4e8c7c3e8e50544;hb=03c127ee1e0c5f7a5285d1af3d5c1571ac2646a1;hp=794b8daa9378e6647064f34174b6849ba50bb2a8;hpb=c4ec20717313daafba59225f812db89595952b83;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
index 794b8daa937..17ca64b5a66 100644
--- a/include/linux/ivtv.h
+++ b/include/linux/ivtv.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTV_H__
 #define __LINUX_IVTV_H__
 
-#ifdef __KERNEL__
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
+#include <linux/compiler.h>
 #include <linux/types.h>
 
 /* ivtv knows several distinct output modes: MPEG streaming,