Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[deliverable/linux.git] / include / linux / matroxfb.h

diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h
index 404f678e734bbed61e512b1d6e071e18269232d5..2203121a43e9a0730bf25e2f336f78bda365a683 100644 (file)
--- a/include/linux/matroxfb.h
+++ b/include/linux/matroxfb.h
@@ -37,7 +37,7 @@ enum matroxfb_ctrl_id {
   MATROXFB_CID_LAST
 };
 
-#define FBIO_WAITFORVSYNC      _IOW('F', 0x20, u_int32_t)
+#define FBIO_WAITFORVSYNC      _IOW('F', 0x20, __u32)
 
 #endif