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/lm78.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/lm78.c')
-rw-r--r-- | drivers/hwmon/lm78.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 008fd9310061..51c0b37c4990 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/jiffies.h> | 24 | #include <linux/jiffies.h> |
25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
26 | #include <linux/i2c-isa.h> | 26 | #include <linux/i2c-isa.h> |
27 | #include <linux/i2c-sensor.h> | ||
28 | #include <linux/hwmon.h> | 27 | #include <linux/hwmon.h> |
29 | #include <linux/err.h> | 28 | #include <linux/err.h> |
30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
@@ -37,7 +36,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, | |||
37 | static unsigned short isa_address = 0x290; | 36 | static unsigned short isa_address = 0x290; |
38 | 37 | ||
39 | /* Insmod parameters */ | 38 | /* Insmod parameters */ |
40 | SENSORS_INSMOD_2(lm78, lm79); | 39 | I2C_CLIENT_INSMOD_2(lm78, lm79); |
41 | 40 | ||
42 | /* Many LM78 constants specified below */ | 41 | /* Many LM78 constants specified below */ |
43 | 42 | ||