diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /include/linux/matroxfb.h | |
parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/matroxfb.h')
-rw-r--r-- | include/linux/matroxfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h index 404f678e734b..2203121a43e9 100644 --- a/include/linux/matroxfb.h +++ b/include/linux/matroxfb.h | |||
@@ -37,7 +37,7 @@ enum matroxfb_ctrl_id { | |||
37 | MATROXFB_CID_LAST | 37 | MATROXFB_CID_LAST |
38 | }; | 38 | }; |
39 | 39 | ||
40 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) | 40 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) |
41 | 41 | ||
42 | #endif | 42 | #endif |
43 | 43 | ||