diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 13:30:35 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 13:30:35 +0100 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /drivers/macintosh/therm_adt746x.c | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
| download | linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.tar.gz linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.tar.bz2 linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/macintosh/therm_adt746x.c')
| -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 5ebfd1d138da..5282fec17075 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); |