diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /include/linux/matroxfb.h | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/matroxfb.h')
| -rw-r--r-- | include/linux/matroxfb.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h index 2203121a43e9..8c22a8938642 100644 --- a/include/linux/matroxfb.h +++ b/include/linux/matroxfb.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <asm/ioctl.h> | 4 | #include <asm/ioctl.h> |
| 5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 6 | #include <linux/videodev2.h> | 6 | #include <linux/videodev2.h> |
| 7 | #include <linux/fb.h> | ||
| 7 | 8 | ||
| 8 | struct matroxioc_output_mode { | 9 | struct matroxioc_output_mode { |
| 9 | __u32 output; /* which output */ | 10 | __u32 output; /* which output */ |
| @@ -37,7 +38,5 @@ enum matroxfb_ctrl_id { | |||
| 37 | MATROXFB_CID_LAST | 38 | MATROXFB_CID_LAST |
| 38 | }; | 39 | }; |
| 39 | 40 | ||
| 40 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
| 41 | |||
| 42 | #endif | 41 | #endif |
| 43 | 42 | ||