summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Pisati <paolo.pisati@canonical.com>2012-05-30 12:17:56 +0800
committerAndy Green <andy.green@linaro.org>2012-06-13 21:32:43 +0800
commitb9f2b53a18087755e0d50b0a80e692d8fdf1482d (patch)
treec365dec0e01008829961c9d3c041e94805dfdf12
parentcc6ccd367f7c8ff28926c8886f962f4df2a94f73 (diff)
UBUNTU: SAUCE: snd_soc_omap_hdmi: add a dummy symbol to enforce dependency on snd_soc_omaptracking-topic-audio-3.4-hdmi
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
-rw-r--r--sound/soc/omap/omap-hdmi.c5
-rw-r--r--sound/soc/omap/omap-pcm.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 03bb24649d7..793e7c76f79 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -236,6 +236,8 @@ static struct snd_soc_dai_driver omap_hdmi_dai = {
.ops = &omap_hdmi_dai_ops,
};
+extern void omap_pcm_dummy(void);
+
static __devinit int omap_hdmi_probe(struct platform_device *pdev)
{
int ret;
@@ -260,6 +262,9 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev)
omap_hdmi_dai_dma_params.dma_req = hdmi_rsrc->start;
+ /* Dummy symbol to enforce loading of snd-soc-omap */
+ omap_pcm_dummy();
+
/*
* Find an HDMI device. In the future, registers all the HDMI devices
* it finds and create a PCM for each.
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 5a649da9122..b55629f9bde 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -408,6 +408,12 @@ out:
return ret;
}
+/* Dummy symbol used to enforce loading of snd_soc_omap */
+void omap_pcm_dummy(void) {
+ pr_info("omap_pcm_dummy() init\n");
+}
+EXPORT_SYMBOL_GPL(omap_pcm_dummy);
+
static struct snd_soc_platform_driver omap_soc_platform = {
.ops = &omap_pcm_ops,
.pcm_new = omap_pcm_new,