aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-04-21 15:04:22 +1000
committerPaul Mackerras <paulus@samba.org>2006-04-21 22:34:26 +1000
commit4d6c58899c1cdac018f92cfa0383bb835a0c80ef (patch)
tree838f2e6ac56784c59e807ffcc2911786c39769f5 /sound/oss/dmasound
parent5ad1bfeaf7a526ea5c5503c8a48e3a5a3efe18f7 (diff)
downloadkernel_samsung_aries-4d6c58899c1cdac018f92cfa0383bb835a0c80ef.zip
kernel_samsung_aries-4d6c58899c1cdac018f92cfa0383bb835a0c80ef.tar.gz
kernel_samsung_aries-4d6c58899c1cdac018f92cfa0383bb835a0c80ef.tar.bz2
[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/oss/dmasound')
-rw-r--r--sound/oss/dmasound/tas_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index 8131599..882ae98 100644
--- a/sound/oss/dmasound/tas_common.c
+++ b/sound/oss/dmasound/tas_common.c
@@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name)
printk(KERN_INFO "tas driver [%s])\n", driver_name);
-#ifndef CONFIG_I2C_KEYWEST
- request_module("i2c-keywest");
+#ifndef CONFIG_I2C_POWERMAC
+ request_module("i2c-powermac");
#endif
tas_node = find_devices("deq");
if (tas_node == NULL)