diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
| commit | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (patch) | |
| tree | bedfff6f96118771b809de30e559cc370f94c7be /sound/ppc | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
| parent | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/toonie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c index 4e595172e423..1ac7c8552f50 100644 --- a/sound/ppc/toonie.c +++ b/sound/ppc/toonie.c | |||
| @@ -335,7 +335,7 @@ static void toonie_cleanup(struct snd_pmac *chip) | |||
| 335 | chip->mixer_data = NULL; | 335 | chip->mixer_data = NULL; |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | int snd_pmac_toonie_init(struct snd_pmac *chip) | 338 | int __init snd_pmac_toonie_init(struct snd_pmac *chip) |
| 339 | { | 339 | { |
| 340 | struct pmac_toonie *mix; | 340 | struct pmac_toonie *mix; |
| 341 | 341 | ||