diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-30 15:34:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-30 15:34:39 -0400 |
| commit | b07019f29328ebb1b48d3faf952b84f07ec9b973 (patch) | |
| tree | 99fbd8379fb9fe17c5b06c74871f71207ebb072e /sound | |
| parent | c3ce7e203af5d8eab7c3390fc991a1fcb152f741 (diff) | |
| parent | e0a515bc6a2188f02916e976f419a8640312e32a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'sound')
| -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 | ||