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/oss | |
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/oss')
-rw-r--r-- | sound/oss/dmasound/tas_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 81315996c0f1..882ae98a41b1 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) | |||
195 | 195 | ||
196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); | 196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); |
197 | 197 | ||
198 | #ifndef CONFIG_I2C_KEYWEST | 198 | #ifndef CONFIG_I2C_POWERMAC |
199 | request_module("i2c-keywest"); | 199 | request_module("i2c-powermac"); |
200 | #endif | 200 | #endif |
201 | tas_node = find_devices("deq"); | 201 | tas_node = find_devices("deq"); |
202 | if (tas_node == NULL) | 202 | if (tas_node == NULL) |