aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/imote2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-12-10 03:00:45 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-10 03:00:45 -0500
commit97768a8e658605a905ba0d908d1b23b475170bed (patch)
tree0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/pxa/imote2.c
parent9621055fbbb190264cb6a8182b70e3f0f917d770 (diff)
parent7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff)
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/pxa/imote2.c')
-rw-r--r--sound/soc/pxa/imote2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index b93dafd32b80..eef1f7b7b38e 100644
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -65,7 +65,7 @@ static struct snd_soc_card imote2 = {
65 .num_links = 1, 65 .num_links = 1,
66}; 66};
67 67
68static int __devinit imote2_probe(struct platform_device *pdev) 68static int imote2_probe(struct platform_device *pdev)
69{ 69{
70 struct snd_soc_card *card = &imote2; 70 struct snd_soc_card *card = &imote2;
71 int ret; 71 int ret;
@@ -79,7 +79,7 @@ static int __devinit imote2_probe(struct platform_device *pdev)
79 return ret; 79 return ret;
80} 80}
81 81
82static int __devexit imote2_remove(struct platform_device *pdev) 82static int imote2_remove(struct platform_device *pdev)
83{ 83{
84 struct snd_soc_card *card = platform_get_drvdata(pdev); 84 struct snd_soc_card *card = platform_get_drvdata(pdev);
85 85
@@ -93,7 +93,7 @@ static struct platform_driver imote2_driver = {
93 .owner = THIS_MODULE, 93 .owner = THIS_MODULE,
94 }, 94 },
95 .probe = imote2_probe, 95 .probe = imote2_probe,
96 .remove = __devexit_p(imote2_remove), 96 .remove = imote2_remove,
97}; 97};
98 98
99module_platform_driver(imote2_driver); 99module_platform_driver(imote2_driver);