diff options
| author | Samreen <samreen@ti.com> | 2010-08-09 18:45:58 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:27:21 -0500 |
| commit | 9c750e3e8efa9123b6c0c65217ae97bc5b47b492 (patch) | |
| tree | 9a90526f692aefda56e0150a88c58f5b1e93ce3f /drivers/media | |
| parent | ee560d75e3e9a390e970fa76853466db3bd6f19b (diff) | |
Merge Fix : Remove build errors when HDMI is disabled
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index cfc1096af2a2..da017ffb0754 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -1051,9 +1051,7 @@ void omap_vout_isr(void *arg, unsigned int irqstatus) struct omap_vout_device *vout = (struct omap_vout_device *)arg; u32 flags; int irq = 0; -#if !(CONFIG_OMAP2_DSS_HDMI) - u32 fid; -#endif + if (!vout->streaming) return; @@ -1097,7 +1095,7 @@ void omap_vout_isr(void *arg, unsigned int irqstatus) } #endif break; -#if CONFIG_OMAP2_DSS_HDMI +#ifdef CONFIG_OMAP2_DSS_HDMI case OMAP_DISPLAY_TYPE_HDMI: if (!(irqstatus & DISPC_IRQ_EVSYNC_EVEN)) goto vout_isr_err; @@ -1156,7 +1154,7 @@ wb: goto vout_isr_err; } -#if !(CONFIG_OMAP2_DSS_HDMI) +#ifndef CONFIG_OMAP2_DSS_HDMI venc: #endif vout->next_frm = list_entry(vout->dma_queue.next, |