diff options
| author | Ricardo Neri <ricardo.neri@ti.com> | 2012-03-15 14:08:03 -0600 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 15:15:22 +0300 |
| commit | 7e151f7f6abdd75831797ae45ec2aa3d0a648416 (patch) | |
| tree | b74dea57e63e80735732b812aa29e835c532a3ad /drivers/video/omap2/dss/dss_features.c | |
| parent | 3df9fb5c51ca617e410da890f631100ea9f10652 (diff) | |
| download | op-kernel-dev-7e151f7f6abdd75831797ae45ec2aa3d0a648416.zip op-kernel-dev-7e151f7f6abdd75831797ae45ec2aa3d0a648416.tar.gz | |
OMAPDSS: HDMI: Decouple HDMI audio from ASoC
Instead of having OMAPDSS HDMI audio functionality depending on the
ASoC HDMI audio driver, use a new config option so that
potential users, including ASoC, may select if needed.
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.c')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 13b45af..1c939fb 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c @@ -573,8 +573,7 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = { .dump_core = ti_hdmi_4xxx_core_dump, .dump_pll = ti_hdmi_4xxx_pll_dump, .dump_phy = ti_hdmi_4xxx_phy_dump, -#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ - defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) .audio_enable = ti_hdmi_4xxx_wp_audio_enable, .audio_disable = ti_hdmi_4xxx_wp_audio_disable, .audio_start = ti_hdmi_4xxx_audio_start, |
