From c125a11d1fa50764c950a54abec31132cb9bdb65 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 21 Apr 2006 15:04:22 +1000
Subject: [PATCH] --- yaml --- r: 26131 b: refs/heads/master c:
 4d6c58899c1cdac018f92cfa0383bb835a0c80ef h: refs/heads/master i:   26129:
 54f2b7edfd65517c2eb4c888ecd2572b37dac479   26127:
 cd7948cd4c9c233b850714261d358774bd51f056 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/macintosh/therm_adt746x.c | 4 ++--
 trunk/sound/oss/dmasound/tas_common.c   | 4 ++--
 trunk/sound/ppc/daca.c                  | 2 +-
 trunk/sound/ppc/tumbler.c               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 203f5274f368..90bffa49cad8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad1bfeaf7a526ea5c5503c8a48e3a5a3efe18f7
+refs/heads/master: 4d6c58899c1cdac018f92cfa0383bb835a0c80ef
diff --git a/trunk/drivers/macintosh/therm_adt746x.c b/trunk/drivers/macintosh/therm_adt746x.c
index 5ebfd1d138da..5282fec17075 100644
--- a/trunk/drivers/macintosh/therm_adt746x.c
+++ b/trunk/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);
diff --git a/trunk/sound/oss/dmasound/tas_common.c b/trunk/sound/oss/dmasound/tas_common.c
index 81315996c0f1..882ae98a41b1 100644
--- a/trunk/sound/oss/dmasound/tas_common.c
+++ b/trunk/sound/oss/dmasound/tas_common.c
@@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name)
 
 	printk(KERN_INFO "tas driver [%s])\n", driver_name);
 
-#ifndef CONFIG_I2C_KEYWEST
-	request_module("i2c-keywest");
+#ifndef CONFIG_I2C_POWERMAC
+	request_module("i2c-powermac");
 #endif
 	tas_node = find_devices("deq");
 	if (tas_node == NULL)
diff --git a/trunk/sound/ppc/daca.c b/trunk/sound/ppc/daca.c
index aa09ebd9ffb8..46eebf5610e3 100644
--- a/trunk/sound/ppc/daca.c
+++ b/trunk/sound/ppc/daca.c
@@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
 
 #ifdef CONFIG_KMOD
 	if (current->fs->root)
-		request_module("i2c-keywest");
+		request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */	
 
 	mix = kmalloc(sizeof(*mix), GFP_KERNEL);
diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c
index 1146dd882bb1..70e4ebc70260 100644
--- a/trunk/sound/ppc/tumbler.c
+++ b/trunk/sound/ppc/tumbler.c
@@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 
 #ifdef CONFIG_KMOD
 	if (current->fs->root)
-		request_module("i2c-keywest");
+		request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */	
 
 	mix = kmalloc(sizeof(*mix), GFP_KERNEL);