diff options
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 4 | ||||
| -rw-r--r-- | sound/oss/dmasound/tas_common.c | 4 | ||||
| -rw-r--r-- | sound/ppc/daca.c | 2 | ||||
| -rw-r--r-- | sound/ppc/tumbler.c | 2 |
4 files changed, 6 insertions, 6 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); |
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 81315996c0f1..882ae98a41b1 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c | |||
| @@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name) | |||
| 195 | 195 | ||
| 196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); | 196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); |
| 197 | 197 | ||
| 198 | #ifndef CONFIG_I2C_KEYWEST | 198 | #ifndef CONFIG_I2C_POWERMAC |
| 199 | request_module("i2c-keywest"); | 199 | request_module("i2c-powermac"); |
| 200 | #endif | 200 | #endif |
| 201 | tas_node = find_devices("deq"); | 201 | tas_node = find_devices("deq"); |
| 202 | if (tas_node == NULL) | 202 | if (tas_node == NULL) |
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index aa09ebd9ffb8..46eebf5610e3 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
| @@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) | |||
| 255 | 255 | ||
| 256 | #ifdef CONFIG_KMOD | 256 | #ifdef CONFIG_KMOD |
| 257 | if (current->fs->root) | 257 | if (current->fs->root) |
| 258 | request_module("i2c-keywest"); | 258 | request_module("i2c-powermac"); |
| 259 | #endif /* CONFIG_KMOD */ | 259 | #endif /* CONFIG_KMOD */ |
| 260 | 260 | ||
| 261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 1146dd882bb1..70e4ebc70260 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
| @@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
| 1313 | 1313 | ||
| 1314 | #ifdef CONFIG_KMOD | 1314 | #ifdef CONFIG_KMOD |
| 1315 | if (current->fs->root) | 1315 | if (current->fs->root) |
| 1316 | request_module("i2c-keywest"); | 1316 | request_module("i2c-powermac"); |
| 1317 | #endif /* CONFIG_KMOD */ | 1317 | #endif /* CONFIG_KMOD */ |
| 1318 | 1318 | ||
| 1319 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 1319 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); |
