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/fsl/mpc8610_hpcd.c | |
| parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
| parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) | |
| download | linux-97768a8e658605a905ba0d908d1b23b475170bed.tar.bz2 | |
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/fsl/mpc8610_hpcd.c')
| -rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 9ff9318c52b9..228c52e71440 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -368,7 +368,7 @@ error_alloc: * * This function is called when the platform device is removed. */ -static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev) +static int mpc8610_hpcd_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); struct mpc8610_hpcd_data *machine_data = @@ -382,7 +382,7 @@ static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev) static struct platform_driver mpc8610_hpcd_driver = { .probe = mpc8610_hpcd_probe, - .remove = __devexit_p(mpc8610_hpcd_remove), + .remove = mpc8610_hpcd_remove, .driver = { /* The name must match 'compatible' property in the device tree, * in lowercase letters. |