aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-28 06:49:07 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-01 14:58:50 -0500
commit968a6025aa9f909d487988efb542217a126023a0 (patch)
tree570f91bce3381826d01b0b1948103f4577b05564 /sound/soc/codecs/ac97.c
parent682d5874f3d654b5d13d9b8dd56b9e05cfadd01b (diff)
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/ac97.c')
-rw-r--r--sound/soc/codecs/ac97.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index c4208c8210c8..fb53e6511af2 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -114,7 +114,7 @@ static int ac97_soc_probe(struct platform_device *pdev)
114 if (ret < 0) 114 if (ret < 0)
115 goto bus_err; 115 goto bus_err;
116 116
117 ret = snd_soc_register_card(socdev); 117 ret = snd_soc_init_card(socdev);
118 if (ret < 0) 118 if (ret < 0)
119 goto bus_err; 119 goto bus_err;
120 return 0; 120 return 0;