aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
-rw-r--r--drivers/video/omap2/dss/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index b2af72dc20b..826d64faeaa 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -138,7 +138,7 @@ int dss_set_min_bus_tput(struct device *dev, unsigned long tput)
138 return 0; 138 return 0;
139} 139}
140 140
141#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) 141#if defined(CONFIG_OMAP2_DSS_DEBUGFS)
142static int dss_debug_show(struct seq_file *s, void *unused) 142static int dss_debug_show(struct seq_file *s, void *unused)
143{ 143{
144 void (*func)(struct seq_file *) = s->private; 144 void (*func)(struct seq_file *) = s->private;
@@ -193,7 +193,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
193 193
194 return 0; 194 return 0;
195} 195}
196#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ 196#else /* CONFIG_OMAP2_DSS_DEBUGFS */
197static inline int dss_initialize_debugfs(void) 197static inline int dss_initialize_debugfs(void)
198{ 198{
199 return 0; 199 return 0;
@@ -205,7 +205,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
205{ 205{
206 return 0; 206 return 0;
207} 207}
208#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ 208#endif /* CONFIG_OMAP2_DSS_DEBUGFS */
209 209
210/* PLATFORM DEVICE */ 210/* PLATFORM DEVICE */
211static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d) 211static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)