diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 16:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 16:42:55 -0700 |
| commit | fa815580fb87d1b8c218f9eba8122b2fc3f1a68c (patch) | |
| tree | 73965c970b8b3879d770ae3729ab5154ff38262f /include | |
| parent | 85579ad7f1dfc0b72bb243b7227bc4f663035e71 (diff) | |
| parent | 57817e619a215588739f3f644986c78b586b541b (diff) | |
| download | linux-fa815580fb87d1b8c218f9eba8122b2fc3f1a68c.tar.bz2 | |
Merge tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
"Minor fixes and cleanups"
* tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: fbdev: atmel_lcdfb: remove useless include
video: fbdev: pxa168fb: Use devm_clk_get
fbdev: ssd1307fb: fix error return code
fbdev: fix snprintf() limit in show_bl_curve()
video: fbdev: s3c-fb: Constify platform_device_id
video: fbdev: atmel: fix warning for const return value
video: fbdev: Drop owner assignment from platform_driver
video: fbdev: Drop owner assignment from i2c_driver
fbdev: remove unnecessary memset in vfb
framebuffer: disable vgacon on microblaze arch
fbdev: udlfb: remove unneeded initialization in few places
fbdev: Allow compile test of GPIO consumers if !GPIOLIB
fbdev: fix cea_modes array size
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 043f3283b71c..bc9afa74ee11 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -788,7 +788,7 @@ struct dmt_videomode { extern const char *fb_mode_option; extern const struct fb_videomode vesa_modes[]; -extern const struct fb_videomode cea_modes[64]; +extern const struct fb_videomode cea_modes[65]; extern const struct dmt_videomode dmt_modes[]; struct fb_modelist { |