Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne...

[deliverable/linux.git] / sound / soc / samsung / s3c24xx_simtec_tlv320aic23.c

diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
index 7324609833d803341b646339881b5004ca7135e0..c42d5f00b0e1cc2cdc75bfcd625bc02a35aa7825 100644 (file)
--- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
@@ -78,6 +78,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = {
 /* simtec audio machine driver */
 static struct snd_soc_card snd_soc_machine_simtec_aic23 = {
        .name           = "Simtec",
+       .owner          = THIS_MODULE,
        .dai_link       = &simtec_dai_aic23,
        .num_links      = 1,
 
@@ -92,7 +93,7 @@ static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd)
        return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic23);
 }
 
-static struct platform_driver simtec_audio_tlv320aic23_platdrv = {
+static struct platform_driver simtec_audio_tlv320aic23_driver = {
        .driver = {
                .owner  = THIS_MODULE,
                .name   = "s3c24xx-simtec-tlv320aic23",
@@ -102,7 +103,7 @@ static struct platform_driver simtec_audio_tlv320aic23_platdrv = {
        .remove = __devexit_p(simtec_audio_remove),
 };
 
-module_platform_driver(simtec_audio_tlv320aic32_driver);
+module_platform_driver(simtec_audio_tlv320aic23_driver);
 
 MODULE_ALIAS("platform:s3c24xx-simtec-tlv320aic23");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");