diff options
| author | Colin Cross <ccross@android.com> | 2010-11-09 15:49:46 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-11-09 15:49:46 -0800 |
| commit | 1b7aeb98256b733251847db1750626b710d4fba1 (patch) | |
| tree | a7943fa1589f0015d8f894fd37099d8f1aeb6733 /include/linux | |
| parent | b449ac9b84009fd7ac8ac9593032a14eae165d27 (diff) | |
| parent | 2d73a7392ab1f36cd6bc728f6bf8e436761e87b8 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 3fc99cbac5f2..8b1f0a982bdb 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -1094,6 +1094,7 @@ extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); /* drivers/video/modedb.c */ #define VESA_MODEDB_SIZE 34 +#define CEA_MODEDB_SIZE 65 extern void fb_var_to_videomode(struct fb_videomode *mode, const struct fb_var_screeninfo *var); extern void fb_videomode_to_var(struct fb_var_screeninfo *var, @@ -1145,6 +1146,7 @@ struct fb_videomode { extern const char *fb_mode_option; extern const struct fb_videomode vesa_modes[]; +extern const struct fb_videomode cea_modes[]; struct fb_modelist { struct list_head list; |