diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:46 +0200 |
| commit | 1282c824cc4ad5b43fc1813e7ea564c0d6f0d046 (patch) | |
| tree | fc82ba9aee9587f65870f8a544f2118b299d33cc /sound/isa | |
| parent | 45d60e3648eaba1f5f6976df901fb7c45660fb49 (diff) | |
| parent | 82ced6fd28653ab456c3e5b25e9ef3c1c96cd6e9 (diff) | |
| download | linux-1282c824cc4ad5b43fc1813e7ea564c0d6f0d046.tar.gz linux-1282c824cc4ad5b43fc1813e7ea564c0d6f0d046.tar.bz2 linux-1282c824cc4ad5b43fc1813e7ea564c0d6f0d046.zip | |
Merge branch 'topic/section-fix' into for-linus
* topic/section-fix:
ALSA: Add missing __devexit_p() markers
ALSA: powermac - Replace the rest of __init*
ALSA: sound/ppc: update annotations of serveral functions
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/es1688/es1688.c | 2 | ||||
| -rw-r--r-- | sound/isa/gus/gusextreme.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index 442b081cafb7..07df201ed8fa 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -193,7 +193,7 @@ static int __devexit snd_es1688_remove(struct device *dev, unsigned int n) static struct isa_driver snd_es1688_driver = { .match = snd_es1688_match, .probe = snd_es1688_probe, - .remove = snd_es1688_remove, + .remove = __devexit_p(snd_es1688_remove), #if 0 /* FIXME */ .suspend = snd_es1688_suspend, .resume = snd_es1688_resume, diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index 180a8dea6bd9..65e4b18581a6 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c @@ -348,7 +348,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) static struct isa_driver snd_gusextreme_driver = { .match = snd_gusextreme_match, .probe = snd_gusextreme_probe, - .remove = snd_gusextreme_remove, + .remove = __devexit_p(snd_gusextreme_remove), #if 0 /* FIXME */ .suspend = snd_gusextreme_suspend, .resume = snd_gusextreme_resume, |