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

diff --combined drivers/video/console/Kconfig
index 0712806,e0dc0fe..38da6e2
--- 1/drivers/video/console/Kconfig
--- 2/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@@ -9,7 -9,7 +9,7 @@@ config VGA_CONSOL
        depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
                !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
                (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
-               !ARM64 && !ARC
 -              !ARM64 && !MICROBLAZE
++              !ARM64 && !ARC && !MICROBLAZE
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a

diff --combined drivers/video/fbdev/Kconfig
index 811acfc,11ac660..8b1d371
--- 1/drivers/video/fbdev/Kconfig
--- 2/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@@ -2464,7 -2464,7 +2464,7 @@@ config FB_SSD130
        tristate "Solomon SSD1307 framebuffer support"
        depends on FB && I2C
        depends on OF
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        select FB_SYS_FOPS
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
@@@ -2475,17 -2475,3 +2475,17 @@@
        help
          This driver implements support for the Solomon SSD1307
          OLED controller over I2C.
 +
 +config FB_SM712
 +      tristate "Silicon Motion SM712 framebuffer support"
 +      depends on FB && PCI
 +      select FB_CFB_FILLRECT
 +      select FB_CFB_COPYAREA
 +      select FB_CFB_IMAGEBLIT
 +      help
 +        Frame buffer driver for the Silicon Motion SM710, SM712, SM721
 +        and SM722 chips.
 +
 +        This driver is also available as a module. The module will be
 +        called sm712fb. If you want to compile it as a module, say M
 +        here and read <file:Documentation/kbuild/modules.txt>.