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/it87.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/it87.c')
-rw-r--r-- | drivers/hwmon/it87.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index d1e04c40e64..84877665b66 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/jiffies.h> | 37 | #include <linux/jiffies.h> |
38 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
39 | #include <linux/i2c-isa.h> | 39 | #include <linux/i2c-isa.h> |
40 | #include <linux/i2c-sensor.h> | ||
41 | #include <linux/i2c-vid.h> | 40 | #include <linux/i2c-vid.h> |
42 | #include <linux/hwmon-sysfs.h> | 41 | #include <linux/hwmon-sysfs.h> |
43 | #include <linux/hwmon.h> | 42 | #include <linux/hwmon.h> |
@@ -51,7 +50,7 @@ static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | |||
51 | static unsigned short isa_address = 0x290; | 50 | static unsigned short isa_address = 0x290; |
52 | 51 | ||
53 | /* Insmod parameters */ | 52 | /* Insmod parameters */ |
54 | SENSORS_INSMOD_2(it87, it8712); | 53 | I2C_CLIENT_INSMOD_2(it87, it8712); |
55 | 54 | ||
56 | #define REG 0x2e /* The register to read/write */ | 55 | #define REG 0x2e /* The register to read/write */ |
57 | #define DEV 0x07 /* Register: Logical device select */ | 56 | #define DEV 0x07 /* Register: Logical device select */ |