summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/uda134x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-28 11:49:07 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-01 19:58:50 +0000
commit968a6025aa9f909d487988efb542217a126023a0 (patch)
tree570f91bce3381826d01b0b1948103f4577b05564 /sound/soc/codecs/uda134x.c
parent682d5874f3d654b5d13d9b8dd56b9e05cfadd01b (diff)
downloadtalos-obmc-linux-968a6025aa9f909d487988efb542217a126023a0.tar.gz
talos-obmc-linux-968a6025aa9f909d487988efb542217a126023a0.zip
ASoC: Rename snd_soc_register_card() to snd_soc_init_card()
Currently ASoC card initialisation is completed by a function called snd_soc_register_card(). As part of the work to allow independant registration of cards, codecs and machines in ASoC v2 a new function of the same name has been added so rename the existing function to facilitate the merge of v2. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
-rw-r--r--sound/soc/codecs/uda134x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 91f333cdc7cf..58de749185e6 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -578,7 +578,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
goto pcm_err;
}
- ret = snd_soc_register_card(socdev);
+ ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "UDA134X: failed to register card\n");
goto card_err;
OpenPOWER on IntegriCloud