diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 14:57:49 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 14:57:49 +0900 |
| commit | d8d776f3fb1ff19c37d43b600fc8c128ff172deb (patch) | |
| tree | 334b0d0273a6acc7d238e1cb492f1b23199d51bc /include/linux | |
| parent | c724d07a56e60e91b0aa75193f86fb000545ffe4 (diff) | |
| parent | 0ad83f6882c41df1a7fa387086029e162038c1f2 (diff) | |
Merge branch 'fbdev/edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev-2.6 into common/fbdev-edid
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 7fca3dc4e475..e154a79b8322 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -1092,6 +1092,8 @@ extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var); extern const unsigned char *fb_firmware_edid(struct device *device); extern void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs); +extern void fb_edid_add_monspecs(unsigned char *edid, + struct fb_monspecs *specs); extern void fb_destroy_modedb(struct fb_videomode *modedb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); @@ -1149,6 +1151,7 @@ struct fb_videomode { extern const char *fb_mode_option; extern const struct fb_videomode vesa_modes[]; +extern const struct fb_videomode cea_modes[64]; struct fb_modelist { struct list_head list; |