summaryrefslogtreecommitdiffstats
path: root/sound/ppc
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2006-04-30 20:34:39 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-30 20:34:39 +0100
commitb07019f29328ebb1b48d3faf952b84f07ec9b973 (patch)
tree99fbd8379fb9fe17c5b06c74871f71207ebb072e /sound/ppc
parentc3ce7e203af5d8eab7c3390fc991a1fcb152f741 (diff)
parente0a515bc6a2188f02916e976f419a8640312e32a (diff)
downloadop-kernel-dev-b07019f29328ebb1b48d3faf952b84f07ec9b973.zip
op-kernel-dev-b07019f29328ebb1b48d3faf952b84f07ec9b973.tar.gz
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/ppc')
-rw-r--r--sound/ppc/toonie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c
index 4e59517..1ac7c85 100644
--- a/sound/ppc/toonie.c
+++ b/sound/ppc/toonie.c
@@ -335,7 +335,7 @@ static void toonie_cleanup(struct snd_pmac *chip)
chip->mixer_data = NULL;
}
-int snd_pmac_toonie_init(struct snd_pmac *chip)
+int __init snd_pmac_toonie_init(struct snd_pmac *chip)
{
struct pmac_toonie *mix;
OpenPOWER on IntegriCloud