fix oops due to i2c-keylarge -> i2c-powermac rename
From: Guido Guenther <agx@sigxcpu.org>
Date: 2006-04-21 08:26:59
Hi, the i2c-keywest module has been renamed to i2c-powermac during the 2.6.16 development cycle. This fixes the corresponding request_module calls so the module gets loaded again and we don't oops on i2c accesses. Patch applies against current Linus git. Please apply: Singend-Off-By: Guido Guenther [off-list ref]
--- orig/linux-2.6.16.7/sound/ppc/tumbler.c 2006-03-20 06:53:29.000000000 +0100
+++ linux-2.6.16.7/sound/ppc/tumbler.c 2006-04-19 23:15:20.000000000 +0200@@ -1314,7 +1314,7 @@ #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); --- orig/linux-2.6.16.7/sound/ppc/daca.c 2006-03-20 06:53:29.000000000 +0100 +++ linux-2.6.16.7/sound/ppc/daca.c 2006-04-19 23:14:33.000000000 +0200
@@ -256,7 +256,7 @@ #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); --- orig/linux-2.6.16.7/sound/oss/dmasound/tas_common.c 2006-03-20 06:53:29.000000000 +0100 +++ linux-2.6.16.7/sound/oss/dmasound/tas_common.c 2006-04-20 20:46:55.000000000 +0200
@@ -195,8 +195,8 @@ 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) --- orig/linux-2.6.16.7/drivers/macintosh/therm_adt746x.c 2006-03-20 06:53:29.000000000 +0100 +++ linux-2.6.16.7/drivers/macintosh/therm_adt746x.c 2006-04-20 20:45:32.000000000 +0200
@@ -627,8 +627,8 @@ 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);
Cheers, -- Guido