diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-04-21 01:04:22 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-21 08:34:26 -0400 |
commit | 4d6c58899c1cdac018f92cfa0383bb835a0c80ef (patch) | |
tree | 838f2e6ac56784c59e807ffcc2911786c39769f5 /sound/ppc | |
parent | 5ad1bfeaf7a526ea5c5503c8a48e3a5a3efe18f7 (diff) |
[PATCH] powerpc: 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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 aa09ebd9ffb8..46eebf5610e3 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
@@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) | |||
255 | 255 | ||
256 | #ifdef CONFIG_KMOD | 256 | #ifdef CONFIG_KMOD |
257 | if (current->fs->root) | 257 | if (current->fs->root) |
258 | request_module("i2c-keywest"); | 258 | request_module("i2c-powermac"); |
259 | #endif /* CONFIG_KMOD */ | 259 | #endif /* CONFIG_KMOD */ |
260 | 260 | ||
261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 1146dd882bb1..70e4ebc70260 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1313 | 1313 | ||
1314 | #ifdef CONFIG_KMOD | 1314 | #ifdef CONFIG_KMOD |
1315 | if (current->fs->root) | 1315 | if (current->fs->root) |
1316 | request_module("i2c-keywest"); | 1316 | request_module("i2c-powermac"); |
1317 | #endif /* CONFIG_KMOD */ | 1317 | #endif /* CONFIG_KMOD */ |
1318 | 1318 | ||
1319 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 1319 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); |