diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-08 05:19:46 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-15 08:14:39 -0500 |
commit | 853525d7785761d2d9c121b41326ab19d3af4a22 (patch) | |
tree | e16f93f5bfc421dd16d78c19e9ea707613a741e5 /drivers/video/omap2/dss | |
parent | 6dd2e42bd892b2e16080ceba451fd9c3ed633145 (diff) |
OMAP: DSS2: fix irq-stats compilation
Fix compilation of the CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS feature.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/dss')
-rw-r--r-- | drivers/video/omap2/dss/core.c | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 791e1cb7c0bc..5939da9cf021 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c | |||
@@ -446,10 +446,12 @@ static int dss_initialize_debugfs(void) | |||
446 | debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir, | 446 | debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir, |
447 | &dss_debug_dump_clocks, &dss_debug_fops); | 447 | &dss_debug_dump_clocks, &dss_debug_fops); |
448 | 448 | ||
449 | #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS | ||
449 | debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir, | 450 | debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir, |
450 | &dispc_dump_irqs, &dss_debug_fops); | 451 | &dispc_dump_irqs, &dss_debug_fops); |
452 | #endif | ||
451 | 453 | ||
452 | #ifdef CONFIG_OMAP2_DSS_DSI | 454 | #if defined(CONFIG_OMAP2_DSS_DSI) && defined(CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS) |
453 | debugfs_create_file("dsi_irq", S_IRUGO, dss_debugfs_dir, | 455 | debugfs_create_file("dsi_irq", S_IRUGO, dss_debugfs_dir, |
454 | &dsi_dump_irqs, &dss_debug_fops); | 456 | &dsi_dump_irqs, &dss_debug_fops); |
455 | #endif | 457 | #endif |
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index de8bfbac9e26..7781c65bbeba 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -2301,8 +2301,6 @@ void dispc_dump_irqs(struct seq_file *s) | |||
2301 | PIS(WAKEUP); | 2301 | PIS(WAKEUP); |
2302 | #undef PIS | 2302 | #undef PIS |
2303 | } | 2303 | } |
2304 | #else | ||
2305 | void dispc_dump_irqs(struct seq_file *s) { } | ||
2306 | #endif | 2304 | #endif |
2307 | 2305 | ||
2308 | void dispc_dump_regs(struct seq_file *s) | 2306 | void dispc_dump_regs(struct seq_file *s) |