summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-06 04:00:15 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-06 04:00:15 +0200
commitc707e950015750c48fdc82c2746415213c0c534d (patch)
tree40c1bd20f7adec786a68f780ad6d1dcb4863751a /sound
parent8ac65de6474e72f1cfc130e3cc1a4bfd5cf8e310 (diff)
parent7d2ac1036b7ff57f73ab64fd897867ddc07bcffe (diff)
downloadlinux-3.10-c707e950015750c48fdc82c2746415213c0c534d.tar.gz
linux-3.10-c707e950015750c48fdc82c2746415213c0c534d.tar.bz2
linux-3.10-c707e950015750c48fdc82c2746415213c0c534d.zip
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/powermac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 5a929069dce..a2b69b8cff4 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -51,7 +51,7 @@ static struct platform_device *device;
/*
*/
-static int __init snd_pmac_probe(struct platform_device *devptr)
+static int __devinit snd_pmac_probe(struct platform_device *devptr)
{
struct snd_card *card;
struct snd_pmac *chip;