Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / drivers / hwmon / lm93.c

diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index b9899b93c25e1293038f93ef3d859d4b7e0cc211..5e678f5c883dc3d9897d3a1db91dc1db2f8aa899 100644 (file)
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -142,7 +142,7 @@
                I2C_FUNC_SMBUS_WORD_DATA)
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(lm93);
@@ -2078,8 +2078,8 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr,
        return sprintf(buf,"%d\n",LM93_VID_FROM_REG(data->vid[nr]));
 }
 
-static SENSOR_DEVICE_ATTR(vid1, S_IRUGO, show_vid, NULL, 0);
-static SENSOR_DEVICE_ATTR(vid2, S_IRUGO, show_vid, NULL, 1);
+static SENSOR_DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL, 0);
+static SENSOR_DEVICE_ATTR(cpu1_vid, S_IRUGO, show_vid, NULL, 1);
 
 static ssize_t show_prochot(struct device *dev, struct device_attribute *attr,
                                char *buf)
@@ -2431,8 +2431,8 @@ static struct attribute *lm93_attrs[] = {
        &sensor_dev_attr_pwm2_auto_spinup_time.dev_attr.attr,
        &dev_attr_pwm_auto_prochot_ramp.attr,
        &dev_attr_pwm_auto_vrdhot_ramp.attr,
-       &sensor_dev_attr_vid1.dev_attr.attr,
-       &sensor_dev_attr_vid2.dev_attr.attr,
+       &sensor_dev_attr_cpu0_vid.dev_attr.attr,
+       &sensor_dev_attr_cpu1_vid.dev_attr.attr,
        &sensor_dev_attr_prochot1.dev_attr.attr,
        &sensor_dev_attr_prochot2.dev_attr.attr,
        &sensor_dev_attr_prochot1_avg.dev_attr.attr,