diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-05 22:00:15 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-05 22:00:15 -0400 |
| commit | c707e950015750c48fdc82c2746415213c0c534d (patch) | |
| tree | 40c1bd20f7adec786a68f780ad6d1dcb4863751a /sound | |
| parent | 8ac65de6474e72f1cfc130e3cc1a4bfd5cf8e310 (diff) | |
| parent | 7d2ac1036b7ff57f73ab64fd897867ddc07bcffe (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/ppc/powermac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 5a929069dce9..a2b69b8cff43 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c | |||
| @@ -51,7 +51,7 @@ static struct platform_device *device; | |||
| 51 | /* | 51 | /* |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | static int __init snd_pmac_probe(struct platform_device *devptr) | 54 | static int __devinit snd_pmac_probe(struct platform_device *devptr) |
| 55 | { | 55 | { |
| 56 | struct snd_card *card; | 56 | struct snd_card *card; |
| 57 | struct snd_pmac *chip; | 57 | struct snd_pmac *chip; |