diff options
author | Guido Guenther <agx@sigxcpu.org> | 2006-04-20 20:59:10 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-24 09:56:04 -0700 |
commit | 10b324edc90922f432d67216722efdd56482abe1 (patch) | |
tree | 268e18ce29e21e25aab02411aba62b034944defb /sound/ppc | |
parent | f3a35610033c3fcaf77d630557d571588541afa3 (diff) | |
download | kernel-common-10b324edc90922f432d67216722efdd56482abe1.tar.gz kernel-common-10b324edc90922f432d67216722efdd56482abe1.tar.bz2 kernel-common-10b324edc90922f432d67216722efdd56482abe1.zip |
[PATCH] PPC: fix oops in alsa powermac driver
this fixes an oops in 2.6.16.X when loading the snd_powermac module. The
name of the requested module changed during the 2.6.16 development cycle
from i2c-keylargo to i2c-powermac:
Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/daca.c | 2 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index 08cde51177d7..b96cd947d079 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c @@ -256,7 +256,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 838fc113c441..39d4cde78882 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1314,7 +1314,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); |