diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /sound/isa/es1688 | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/isa/es1688')
| -rw-r--r-- | sound/isa/es1688/es1688.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index 7f29f56e405..65f97ff4eef 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -73,7 +73,7 @@ static struct platform_device *devices[SNDRV_CARDS]; #define PFX "es1688: " -static int __init snd_es1688_probe(struct platform_device *pdev) +static int __devinit snd_es1688_probe(struct platform_device *pdev) { int dev = pdev->id; static int possible_irqs[] = {5, 9, 10, 7, -1}; @@ -171,7 +171,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev) return err; } -static int snd_es1688_remove(struct platform_device *devptr) +static int __devexit snd_es1688_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -182,7 +182,7 @@ static int snd_es1688_remove(struct platform_device *devptr) static struct platform_driver snd_es1688_driver = { .probe = snd_es1688_probe, - .remove = snd_es1688_remove, + .remove = __devexit_p(snd_es1688_remove), /* FIXME: suspend/resume */ .driver = { .name = ES1688_DRIVER |