From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Tue, 7 Oct 2008 11:49:23 +0000 (+0300)
Subject: ALSA: ASoC: tlv320aic3x: Use uniform tlv320aic naming
X-Git-Tag: v2.6.28-rc1~102^2~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e78cc18d91f23edd9c5319bc1b15a540e351d942;p=linux-2.6-omap-h63xx.git

ALSA: ASoC: tlv320aic3x: Use uniform tlv320aic naming

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 566a427c928..57fc5aff054 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -991,7 +991,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected);
 			 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 struct snd_soc_dai aic3x_dai = {
-	.name = "aic3x",
+	.name = "tlv320aic3x",
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 1,
@@ -1055,7 +1055,7 @@ static int aic3x_init(struct snd_soc_device *socdev)
 	struct aic3x_setup_data *setup = socdev->codec_data;
 	int reg, ret = 0;
 
-	codec->name = "aic3x";
+	codec->name = "tlv320aic3x";
 	codec->owner = THIS_MODULE;
 	codec->read = aic3x_read_reg_cache;
 	codec->write = aic3x_write;