diff options
Diffstat (limited to 'sound/soc/pxa/poodle.c')
-rw-r--r-- | sound/soc/pxa/poodle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index d2cc81735036..fafe46355c31 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -269,7 +269,7 @@ static struct snd_soc_card poodle = { | |||
269 | .num_dapm_routes = ARRAY_SIZE(poodle_audio_map), | 269 | .num_dapm_routes = ARRAY_SIZE(poodle_audio_map), |
270 | }; | 270 | }; |
271 | 271 | ||
272 | static int __devinit poodle_probe(struct platform_device *pdev) | 272 | static int poodle_probe(struct platform_device *pdev) |
273 | { | 273 | { |
274 | struct snd_soc_card *card = &poodle; | 274 | struct snd_soc_card *card = &poodle; |
275 | int ret; | 275 | int ret; |
@@ -291,7 +291,7 @@ static int __devinit poodle_probe(struct platform_device *pdev) | |||
291 | return ret; | 291 | return ret; |
292 | } | 292 | } |
293 | 293 | ||
294 | static int __devexit poodle_remove(struct platform_device *pdev) | 294 | static int poodle_remove(struct platform_device *pdev) |
295 | { | 295 | { |
296 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 296 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
297 | 297 | ||
@@ -305,7 +305,7 @@ static struct platform_driver poodle_driver = { | |||
305 | .owner = THIS_MODULE, | 305 | .owner = THIS_MODULE, |
306 | }, | 306 | }, |
307 | .probe = poodle_probe, | 307 | .probe = poodle_probe, |
308 | .remove = __devexit_p(poodle_remove), | 308 | .remove = poodle_remove, |
309 | }; | 309 | }; |
310 | 310 | ||
311 | module_platform_driver(poodle_driver); | 311 | module_platform_driver(poodle_driver); |