V4L/DVB (11111): dvb_dummy_fe: Fix compilation breakage

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

diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
index e980ba62ddcc23f405fa06a91d512bb25193312b..9d88b29ddf5556bef668c09d4503c659b471dd7a 100644 (file)
--- a/include/linux/ivtvfb.h
+++ b/include/linux/ivtvfb.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTVFB_H__
 #define __LINUX_IVTVFB_H__
 
-#ifdef __KERNEL__
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
+#include <linux/compiler.h>
 #include <linux/types.h>
 
 /* Framebuffer external API */
@@ -37,6 +33,6 @@ struct ivtvfb_dma_frame {
 };
 
 #define IVTVFB_IOC_DMA_FRAME   _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
-#define FBIO_WAITFORVSYNC      _IOW('F', 0x20, u_int32_t)
+#define FBIO_WAITFORVSYNC      _IOW('F', 0x20, __u32)
 
 #endif