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/ppc/beep.c | |
| 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/ppc/beep.c')
| -rw-r--r-- | sound/ppc/beep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index 89f5c328acf..a9d350789f5 100644 --- a/sound/ppc/beep.c +++ b/sound/ppc/beep.c @@ -215,7 +215,7 @@ static struct snd_kcontrol_new snd_pmac_beep_mixer = { }; /* Initialize beep stuff */ -int __init snd_pmac_attach_beep(struct snd_pmac *chip) +int __devinit snd_pmac_attach_beep(struct snd_pmac *chip) { struct pmac_beep *beep; struct input_dev *input_dev; |