aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/gl520sm.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-31 15:52:01 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 12:14:22 -0400
commit303760b44a7a142cb9f4c9df4609fb63bbda98db (patch)
tree8097f99cd993bc005b25e14a5690770b6e351195 /drivers/hwmon/gl520sm.c
parentf4b50261207c987913f076d867c2e154d71fd012 (diff)
[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/gl520sm.c')
-rw-r--r--drivers/hwmon/gl520sm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index de6608a159c..12fd757066f 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -26,8 +26,8 @@
26#include <linux/slab.h> 26#include <linux/slab.h>
27#include <linux/jiffies.h> 27#include <linux/jiffies.h>
28#include <linux/i2c.h> 28#include <linux/i2c.h>
29#include <linux/i2c-vid.h>
30#include <linux/hwmon.h> 29#include <linux/hwmon.h>
30#include <linux/hwmon-vid.h>
31#include <linux/err.h> 31#include <linux/err.h>
32 32
33/* Type of the extra sensor */ 33/* Type of the extra sensor */
@@ -617,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client)
617 conf = oldconf = gl520_read_value(client, GL520_REG_CONF); 617 conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
618 618
619 data->alarm_mask = 0xff; 619 data->alarm_mask = 0xff;
620 data->vrm = i2c_which_vrm(); 620 data->vrm = vid_which_vrm();
621 621
622 if (extra_sensor_type == 1) 622 if (extra_sensor_type == 1)
623 conf &= ~0x10; 623 conf &= ~0x10;