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

[sfrench/cifs-2.6.git] / include / video / of_display_timing.h

diff --git a/include/video/of_display_timing.h b/include/video/of_display_timing.h
index 79e6697af6cff177712d619e0c4ac7102bff009b..ea755b5616d8050c5bed447b0d7386c4105dfe14 100644 (file)
--- 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