summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-23 09:36:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-23 09:36:31 -0700
commita580e5b9a5ba7d6db5647c36ee118b8890ba3033 (patch)
treebfb7bbf852315085d7868165691057b170af1ab1 /drivers
parent93e1b7d42e1edb4ddde6257e9a02513fef26f715 (diff)
parentd0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da (diff)
downloadlinux-a580e5b9a5ba7d6db5647c36ee118b8890ba3033.tar.gz
linux-a580e5b9a5ba7d6db5647c36ee118b8890ba3033.tar.bz2
linux-a580e5b9a5ba7d6db5647c36ee118b8890ba3033.zip
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.c4
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);