Re: [PATCH] therm_* drivers need i2c-keywest

["Colin Leroy" <colin@colino.net>]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

hi,

> And you want to drop the #ifdef CONFIG_KMOD, since that's already in
> <linux/kmod.h>.

Sure, here it is.
--
Colin
Ne disez pas disez, mais disez dites

[-- Attachment #2: therm_load_i2c.diff --]
[-- Type: application/octet-stream, Size: 2275 bytes --]

Index: drivers/macintosh/therm_adt7467.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_adt7467.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_adt7467.c
--- drivers/macintosh/therm_adt7467.c	11 Jan 2004 20:21:54 -0000	1.1
+++ drivers/macintosh/therm_adt7467.c	16 Jan 2004 12:47:07 -0000
@@ -27,6 +27,7 @@
 #include <asm/system.h>
 #include <asm/sections.h>
 #include <asm/of_device.h>
+#include <linux/kmod.h>
 
 #undef DEBUG
 
@@ -424,6 +425,7 @@
 	device_create_file(&of_dev->dev, &dev_attr_gpu_limit);
 	device_create_file(&of_dev->dev, &dev_attr_fan_speed);
 	
+	request_module("i2c-keywest");
 	return i2c_add_driver(&thermostat_driver);
 }
 
Index: drivers/macintosh/therm_pm72.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_pm72.c,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 therm_pm72.c
--- drivers/macintosh/therm_pm72.c	8 Jan 2004 11:25:19 -0000	1.1.1.1
+++ drivers/macintosh/therm_pm72.c	16 Jan 2004 12:47:15 -0000
@@ -91,6 +91,7 @@
 #include <asm/system.h>
 #include <asm/sections.h>
 #include <asm/of_device.h>
+#include <linux/kmod.h>
 
 #include "therm_pm72.h"
 
@@ -1165,6 +1166,7 @@
 
 	state = state_detached;
 
+	request_module("i2c-keywest");
 	rc = i2c_add_driver(&therm_pm72_driver);
 	if (rc < 0)
 		return rc;
Index: drivers/macintosh/therm_windtunnel.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_windtunnel.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_windtunnel.c
--- drivers/macintosh/therm_windtunnel.c	11 Jan 2004 20:21:55 -0000	1.1
+++ drivers/macintosh/therm_windtunnel.c	16 Jan 2004 12:47:23 -0000
@@ -44,6 +44,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/sections.h>
+#include <linux/kmod.h>
 
 MODULE_AUTHOR("Samuel Rydh <samuel@ibrium.se>");
 MODULE_DESCRIPTION("Apple G4 (windtunnel) fan driver");
@@ -380,6 +381,7 @@
 		printk(KERN_ERR "g4fan: unsupported machine type\n");
 		return -ENODEV;
 	}
+	request_module("i2c-keywest");
 	if( (ret=i2c_add_driver(&g4fan_driver)) )
 		return ret;