diff options
| author | Samreen <samreen@ti.com> | 2010-08-09 18:45:58 +0530 |
|---|---|---|
| committer | Mayuresh Janorkar <mayur@ti.com> | 2010-08-12 20:12:16 +0530 |
| commit | a42809d8849eae093452c9682ad5d1522b5f56e2 (patch) | |
| tree | 38655b6d089390d1b36459bd41ab804f91bc1302 | |
| parent | e47705337294d9e339ab2194ec5f5728f8a53ee2 (diff) | |
Merge Fix : Remove build errors when HDMI is disabled
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 8 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 8 |
2 files changed, 9 insertions, 7 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, diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 1560bb683753..1d9946fe6d60 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -582,13 +582,13 @@ static int omap_dss_probe(struct platform_device *pdev) } } } - +#ifdef CONFIG_OMAP2_DSS_HDMI r = hdmi_init(pdev); if (r) { DSSERR("Failed to initialize hdmi\n"); goto err_hdmi; } - +#endif r = dss_initialize_debugfs(); if (r) goto err_debugfs; @@ -618,8 +618,10 @@ static int omap_dss_probe(struct platform_device *pdev) err_register: dss_uninitialize_debugfs(); err_debugfs: +#ifdef CONFIG_OMAP2_DSS_HDMI hdmi_exit(); err_hdmi: +#endif if (cpu_is_omap44xx()) dsi2_exit(); err_dsi2: @@ -655,7 +657,9 @@ static int omap_dss_remove(struct platform_device *pdev) dss_uninitialize_debugfs(); venc_exit(); +#ifdef CONFIG_OMAP2_DSS_HDMI hdmi_exit(); +#endif dispc_exit(); dpi_exit(); rfbi_exit(); |