diff options
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.h | 4 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h index 788c24afaf9..924f69c1c44 100644 --- a/sound/arm/aaci.h +++ b/sound/arm/aaci.h @@ -228,8 +228,8 @@ struct aaci { /* AC'97 */ struct mutex ac97_sem; - ac97_bus_t *ac97_bus; - ac97_t *ac97; + struct snd_ac97_bus *ac97_bus; + struct snd_ac97 *ac97; u32 maincr; spinlock_t lock; diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index dede954b2c6..28db4be7a16 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -305,7 +305,7 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) #define pxa2xx_ac97_resume NULL #endif -static int pxa2xx_ac97_probe(struct platform_device *dev) +static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) { struct snd_card *card; struct snd_ac97_bus *ac97_bus; @@ -369,7 +369,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) return ret; } -static int pxa2xx_ac97_remove(struct platform_device *dev) +static int __devexit pxa2xx_ac97_remove(struct platform_device *dev) { struct snd_card *card = platform_get_drvdata(dev); @@ -386,7 +386,7 @@ static int pxa2xx_ac97_remove(struct platform_device *dev) static struct platform_driver pxa2xx_ac97_driver = { .probe = pxa2xx_ac97_probe, - .remove = pxa2xx_ac97_remove, + .remove = __devexit_p(pxa2xx_ac97_remove), .suspend = pxa2xx_ac97_suspend, .resume = pxa2xx_ac97_resume, .driver = { |