diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-19 05:03:02 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-19 05:03:02 +0400 |
| commit | 0a582821d4f8edf41d9b56ae057ee2002fc275f0 (patch) | |
| tree | 199f0de91106f143c4ec62b6a8598383b422205b /include/video | |
| parent | 8a5de18239e418fe7b1f36504834689f754d8ccc (diff) | |
| parent | 33ac9dba859b07d40e9ec826057d20c857fdede5 (diff) | |
| download | linux-0a582821d4f8edf41d9b56ae057ee2002fc275f0.tar.xz | |
Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
- new 6x10 font
- various small fixes and cleanups
* tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits)
fonts: Add 6x10 font
videomode: provide dummy inline functions for !CONFIG_OF
video/atmel_lcdfb: Introduce regulator support
fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume
framebuffer: fix screen corruption when copying
framebuffer: fix border color
arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss
video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info
video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info
video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info
video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info
video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info
video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info
video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy
video: valkyriefb: Fix unused variable warning in set_valkyrie_clock()
video: fbdev: use %*ph specifier to dump small buffers
video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT
video: fbdev: au1200fb: delete double assignment
video: fbdev: sis: delete double assignment
...
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/of_display_timing.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/video/of_display_timing.h b/include/video/of_display_timing.h index 79e6697af6cf..ea755b5616d8 100644 --- a/include/video/of_display_timing.h +++ b/include/video/of_display_timing.h @@ -15,9 +15,25 @@ struct display_timings; #define OF_USE_NATIVE_MODE -1 +#ifdef CONFIG_OF int of_get_display_timing(struct device_node *np, const char *name, struct display_timing *dt); struct display_timings *of_get_display_timings(struct device_node *np); int of_display_timings_exist(struct device_node *np); +#else +static inline int of_get_display_timing(struct device_node *np, const char *name, + struct display_timing *dt) +{ + return -ENOSYS; +} +static inline struct display_timings *of_get_display_timings(struct device_node *np) +{ + return NULL; +} +static inline int of_display_timings_exist(struct device_node *np) +{ + return -ENOSYS; +} +#endif #endif |