Merge tag 'fbdev-main-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

Pull main fbdev changes from Tomi Valkeinen:
 "Mainly fixes and small improvements.  The biggest change seems to be
  backlight control support for mx3fb"

* tag 'fbdev-main-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (31 commits)
  drivers/video/fbdev/fb-puv3.c: Add header files for function unifb_mmap
  video: fbdev: s3fb.c: Fix for possible null pointer dereference
  video: fbdev: grvga.c: Fix for possible null pointer dereference
  matroxfb: perform a dummy read of M_STATUS
  video: of: display_timing: fix default native-mode setting
  video: delete unneeded call to platform_get_drvdata
  video: mx3fb: Add backlight control support
  video: omap: delete support for early fbmem allocation
  video: of: display_timing: remove two unsafe error messages
  fbdev: fbmem: remove positive test on unsigned values
  fbcon: Fix memory leak in con2fb_release_oldinfo()
  video: Kconfig: Add a dependency to the Goldfish framebuffer driver
  video: exynos: Add a dependency to the menu
  video: mx3fb: Use devm_kzalloc
  video/nuc900: allow modular build
  video: atmel needs FB_BACKLIGHT
  video: export fb_prepare_logo
  video/mbx: fix building debugfs support
  video/omap: fix modular build
  video: clarify I2C dependencies
  ...

diff --combined include/linux/omap-dma.h
index 7944cdc27bed63df0f8b9cde11f1611af2fdd859,0a1a2e2d5c217a6283ff2354640fde21b94e6e6e..c29a6dee6bec5906a2b72503463761197fce17a0
--- 1/include/linux/omap-dma.h
--- 2/include/linux/omap-dma.h
+++ b/include/linux/omap-dma.h
@@@ -10,7 -10,7 +10,7 @@@
  
  struct dma_chan;
  
 -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
 +#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
  bool omap_dma_filter_fn(struct dma_chan *, void *);
  #else
  static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
@@@ -393,7 -393,7 +393,7 @@@ extern int omap_modify_dma_chain_params
  extern int omap_dma_chain_status(int chain_id);
  #endif
  
- #if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_FB_OMAP)
+ #if defined(CONFIG_ARCH_OMAP1) && IS_ENABLED(CONFIG_FB_OMAP)
  #include <mach/lcd_dma.h>
  #else
  static inline int omap_lcd_dma_running(void)