diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:36:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:36:31 -0400 |
| commit | a580e5b9a5ba7d6db5647c36ee118b8890ba3033 (patch) | |
| tree | bfb7bbf852315085d7868165691057b170af1ab1 /drivers | |
| parent | 93e1b7d42e1edb4ddde6257e9a02513fef26f715 (diff) | |
| parent | d0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Fix define_machine so machine_is() works from modules
powerpc/ppc: export strncasecmp
[PATCH] powerpc: fix oops in alsa powermac driver
[PATCH] powerpc: update {g5,iseries,pseries}_defconfigs
[PATCH] ppc: Fix powersave code on arch/ppc
[PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table
[PATCH] powermac: Fix i2c on keywest based chips
[PATCH] powerpc: Lower threshold for DART enablement to 1GB
[PATCH] powerpc: IOMMU support for honoring dma_mask
Diffstat (limited to 'drivers')
| -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); |