diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-04-21 15:04:22 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-21 22:34:26 +1000 |
| commit | 4d6c58899c1cdac018f92cfa0383bb835a0c80ef (patch) | |
| tree | 838f2e6ac56784c59e807ffcc2911786c39769f5 /drivers/macintosh | |
| parent | 5ad1bfeaf7a526ea5c5503c8a48e3a5a3efe18f7 (diff) | |
| download | op-kernel-dev-4d6c58899c1cdac018f92cfa0383bb835a0c80ef.zip op-kernel-dev-4d6c58899c1cdac018f92cfa0383bb835a0c80ef.tar.gz | |
[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 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 5ebfd1d..5282fec 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c @@ -627,8 +627,8 @@ thermostat_init(void) if(therm_type == ADT7460) device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); -#ifndef CONFIG_I2C_KEYWEST - request_module("i2c-keywest"); +#ifndef CONFIG_I2C_POWERMAC + request_module("i2c-powermac"); #endif return i2c_add_driver(&thermostat_driver); |
