diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 09:05:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 09:05:12 -0700 |
| commit | d55696af8d91e8f21dacd74a236e6dcc4f6d78c4 (patch) | |
| tree | 99c14624b8da7ad38f357c3ca225dc5c0e46ab9d /include/linux/omap-dma.h | |
| parent | 4dc4226f994db264c844a5fcf556935c66f963a5 (diff) | |
| parent | fbc6c4a13bbfb420eedfdb26a0a859f9c07e8a7b (diff) | |
| download | talos-obmc-linux-d55696af8d91e8f21dacd74a236e6dcc4f6d78c4.tar.gz talos-obmc-linux-d55696af8d91e8f21dacd74a236e6dcc4f6d78c4.zip | |
Merge tag 'fbdev-main-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into next
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
...
Diffstat (limited to 'include/linux/omap-dma.h')
| -rw-r--r-- | include/linux/omap-dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 7944cdc27bed..c29a6dee6bec 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -393,7 +393,7 @@ extern int omap_modify_dma_chain_params(int chain_id, 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) |
