diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 21:52:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:22 -0700 |
| commit | 303760b44a7a142cb9f4c9df4609fb63bbda98db (patch) | |
| tree | 8097f99cd993bc005b25e14a5690770b6e351195 /drivers/hwmon/adm9240.c | |
| parent | f4b50261207c987913f076d867c2e154d71fd012 (diff) | |
| download | blackbird-op-linux-303760b44a7a142cb9f4c9df4609fb63bbda98db.tar.gz blackbird-op-linux-303760b44a7a142cb9f4c9df4609fb63bbda98db.zip | |
[PATCH] hwmon: hwmon vs i2c, second round (07/11)
The only part left in i2c-sensor is the VRM/VRD/VID handling code.
This is in no way related to i2c, so it doesn't belong there. Move
the code to hwmon, where it belongs.
Note that not all hardware monitoring drivers do VRM/VRD/VID
operations, so less drivers depend on hwmon-vid than there were
depending on i2c-sensor.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/adm9240.c')
| -rw-r--r-- | drivers/hwmon/adm9240.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c index 0a742cb88f4c..bc7faef162f7 100644 --- a/drivers/hwmon/adm9240.c +++ b/drivers/hwmon/adm9240.c @@ -45,8 +45,8 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/i2c.h> -#include <linux/i2c-vid.h> #include <linux/hwmon.h> +#include <linux/hwmon-vid.h> #include <linux/err.h> /* Addresses to scan */ @@ -657,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client) u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG); u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3; - data->vrm = i2c_which_vrm(); /* need this to report vid as mV */ + data->vrm = vid_which_vrm(); /* need this to report vid as mV */ dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10, data->vrm % 10); |
