diff options
| author | David Teigland <teigland@redhat.com> | 2006-04-27 11:49:55 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-27 11:49:55 -0400 |
| commit | d26046bb0aff707aac38a9bf3dd56fa39b28a399 (patch) | |
| tree | c59e0514ca45cb56c3cbf7920a4590dad6975bcd /drivers/macintosh/therm_adt746x.c | |
| parent | e7f5c01caddbad150dcf003f76cd5aac413f4c50 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master'
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) | |||
| 627 | if(therm_type == ADT7460) | 627 | if(therm_type == ADT7460) |
| 628 | device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); | 628 | device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); |
| 629 | 629 | ||
| 630 | #ifndef CONFIG_I2C_KEYWEST | 630 | #ifndef CONFIG_I2C_POWERMAC |
| 631 | request_module("i2c-keywest"); | 631 | request_module("i2c-powermac"); |
| 632 | #endif | 632 | #endif |
| 633 | 633 | ||
| 634 | return i2c_add_driver(&thermostat_driver); | 634 | return i2c_add_driver(&thermostat_driver); |