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 /drivers/video/intelfb/intelfb.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 'drivers/video/intelfb/intelfb.h')
| -rw-r--r-- | drivers/video/intelfb/intelfb.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 40984551c927..6b51175629c7 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
| @@ -371,10 +371,6 @@ struct intelfb_info { | |||
| 371 | ((dinfo)->chipset == INTEL_965G) || \ | 371 | ((dinfo)->chipset == INTEL_965G) || \ |
| 372 | ((dinfo)->chipset == INTEL_965GM)) | 372 | ((dinfo)->chipset == INTEL_965GM)) |
| 373 | 373 | ||
| 374 | #ifndef FBIO_WAITFORVSYNC | ||
| 375 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
| 376 | #endif | ||
| 377 | |||
| 378 | /*** function prototypes ***/ | 374 | /*** function prototypes ***/ |
| 379 | 375 | ||
| 380 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); | 376 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); |