diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 09:00:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-10 09:00:45 +0100 |
| commit | 97768a8e658605a905ba0d908d1b23b475170bed (patch) | |
| tree | 0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/nuc900/nuc900-ac97.c | |
| parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
| parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) | |
| download | linux-stable-97768a8e658605a905ba0d908d1b23b475170bed.tar.gz linux-stable-97768a8e658605a905ba0d908d1b23b475170bed.tar.bz2 linux-stable-97768a8e658605a905ba0d908d1b23b475170bed.zip | |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Some incremental updates, nothing too exciting. The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.
There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
Diffstat (limited to 'sound/soc/nuc900/nuc900-ac97.c')
| -rw-r--r-- | sound/soc/nuc900/nuc900-ac97.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 946020a647db..0418467a4848 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -314,7 +314,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { .ops = &nuc900_ac97_dai_ops, }; -static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) +static int nuc900_ac97_drvprobe(struct platform_device *pdev) { struct nuc900_audio *nuc900_audio; int ret; @@ -382,7 +382,7 @@ out0: return ret; } -static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) +static int nuc900_ac97_drvremove(struct platform_device *pdev) { snd_soc_unregister_dai(&pdev->dev); @@ -403,7 +403,7 @@ static struct platform_driver nuc900_ac97_driver = { .owner = THIS_MODULE, }, .probe = nuc900_ac97_drvprobe, - .remove = __devexit_p(nuc900_ac97_drvremove), + .remove = nuc900_ac97_drvremove, }; module_platform_driver(nuc900_ac97_driver); |