diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /include/linux/matroxfb.h | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
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 | ||