diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 15:49:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:21 -0400 |
commit | f4b50261207c987913f076d867c2e154d71fd012 (patch) | |
tree | 0b50cfa93f2e1e6a877f51028f93539db0e4547e /drivers/hwmon/w83792d.c | |
parent | 96478ef3f3f71fa929cc905cc794993e312d9a5d (diff) |
[PATCH] hwmon: hwmon vs i2c, second round (06/11)
The only thing left in i2c-sensor.h are module parameter definition
macros. It's only an extension of what i2c.h offers, and this extension
is not sensors-specific. As a matter of fact, a few non-sensors drivers
use them. So we better merge them in i2c.h, and get rid of i2c-sensor.h
altogether.
Signed-off-by: Jean Delvare <khali@linux-fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/w83792d.c')
-rw-r--r-- | drivers/hwmon/w83792d.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 49e3ccd84bd0..d6d8c0f04e32 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
43 | #include <linux/i2c-sensor.h> | ||
44 | #include <linux/i2c-vid.h> | 43 | #include <linux/i2c-vid.h> |
45 | #include <linux/hwmon.h> | 44 | #include <linux/hwmon.h> |
46 | #include <linux/hwmon-sysfs.h> | 45 | #include <linux/hwmon-sysfs.h> |
@@ -50,7 +49,7 @@ | |||
50 | static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; | 49 | static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; |
51 | 50 | ||
52 | /* Insmod parameters */ | 51 | /* Insmod parameters */ |
53 | SENSORS_INSMOD_1(w83792d); | 52 | I2C_CLIENT_INSMOD_1(w83792d); |
54 | I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: " | 53 | I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: " |
55 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 54 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); |
56 | 55 | ||