diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:46 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:46 -0400 |
| commit | 1282c824cc4ad5b43fc1813e7ea564c0d6f0d046 (patch) | |
| tree | fc82ba9aee9587f65870f8a544f2118b299d33cc /sound/parisc | |
| parent | 45d60e3648eaba1f5f6976df901fb7c45660fb49 (diff) | |
| parent | 82ced6fd28653ab456c3e5b25e9ef3c1c96cd6e9 (diff) | |
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.c | 2 |
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 = { | |||
| 1020 | .name = "harmony", | 1020 | .name = "harmony", |
| 1021 | .id_table = snd_harmony_devtable, | 1021 | .id_table = snd_harmony_devtable, |
| 1022 | .probe = snd_harmony_probe, | 1022 | .probe = snd_harmony_probe, |
| 1023 | .remove = snd_harmony_remove, | 1023 | .remove = __devexit_p(snd_harmony_remove), |
| 1024 | }; | 1024 | }; |
| 1025 | 1025 | ||
| 1026 | static int __init | 1026 | static int __init |