aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
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 /include/sound
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 'include/sound')
-rw-r--r--include/sound/soc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 444f9c211379..9356c1ce98c1 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -162,7 +162,7 @@ extern struct snd_ac97_bus_ops soc_ac97_ops;
162/* pcm <-> DAI connect */ 162/* pcm <-> DAI connect */
163void snd_soc_free_pcms(struct snd_soc_device *socdev); 163void snd_soc_free_pcms(struct snd_soc_device *socdev);
164int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid); 164int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
165int snd_soc_register_card(struct snd_soc_device *socdev); 165int snd_soc_init_card(struct snd_soc_device *socdev);
166 166
167/* set runtime hw params */ 167/* set runtime hw params */
168int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, 168int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,