Merge branch 'for-linus' of git://neil.brown.name/md

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

diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
index e20af47b59ad5df5d84224e75fa89f1173ab7dba..9d88b29ddf5556bef668c09d4503c659b471dd7a 100644 (file)
--- a/include/linux/ivtvfb.h
+++ b/include/linux/ivtvfb.h
@@ -33,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