summaryrefslogtreecommitdiffstats
path: root/sound/parisc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:46 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:46 +0200
commit1282c824cc4ad5b43fc1813e7ea564c0d6f0d046 (patch)
treefc82ba9aee9587f65870f8a544f2118b299d33cc /sound/parisc
parent45d60e3648eaba1f5f6976df901fb7c45660fb49 (diff)
parent82ced6fd28653ab456c3e5b25e9ef3c1c96cd6e9 (diff)
downloadlinux-stable-1282c824cc4ad5b43fc1813e7ea564c0d6f0d046.tar.gz
linux-stable-1282c824cc4ad5b43fc1813e7ea564c0d6f0d046.tar.bz2
linux-stable-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/parisc')
-rw-r--r--sound/parisc/harmony.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 63ae0f9aeaf5..e924492df21d 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_driver = {
.name = "harmony",
.id_table = snd_harmony_devtable,
.probe = snd_harmony_probe,
- .remove = snd_harmony_remove,
+ .remove = __devexit_p(snd_harmony_remove),
};
static int __init