From eb62f8fa7bdbacf3f0e16eaad157de0c57392787 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 4 Sep 2007 13:57:33 +0000 Subject: [PATCH] Fix lm93 VID support for Linux 2.6. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4745 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + lib/chips.c | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 3640a879..368e3a65 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ SVN HEAD Speed up sensors_get_ignored() a bit Fix thmc50 support for Linux 2.6 Fix bmcsensors support for Linux 2.6 + Fix lm93 VID support for Linux 2.6 Makefile: Fix kernel version detection (#2187) Module fscher: Add missing read of control register (2.6 backport) Module i2c-piix4: Add ATI SB700 and SB800 support (2.6 backport) diff --git a/lib/chips.c b/lib/chips.c index f93428f4..820fd9f1 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -1193,11 +1193,6 @@ static sensors_chip_feature as99127f_features[] = SENSORS_LM93_TEMP##nr, SENSORS_LM93_TEMP##nr, RW }, \ LM93_SYSCTL_TEMP##nr, VALUE(2), 1 } -/* macro for LM93 VID entries */ -#define SENSORS_LM93_VID(nr) \ - { { SENSORS_LM93_VID##nr, "vid" #nr, NOMAP, NOMAP, R }, \ - LM93_SYSCTL_VID##nr, VALUE(1), 3 } - static sensors_chip_feature lm93_features[] = { SENSORS_LM93_IN_MIN_MAX(1), SENSORS_LM93_IN_MIN_MAX(2), @@ -1222,8 +1217,10 @@ static sensors_chip_feature lm93_features[] = { SENSORS_LM93_TEMP_MIN_MAX(1), SENSORS_LM93_TEMP_MIN_MAX(2), SENSORS_LM93_TEMP_MIN_MAX(3), - SENSORS_LM93_VID(1), - SENSORS_LM93_VID(2), + { { SENSORS_LM93_VID1, "vid1", NOMAP, NOMAP, R }, + LM93_SYSCTL_VID1, VALUE(1), 3, "cpu0_vid", 3, "vid1" }, + { { SENSORS_LM93_VID1, "vid2", NOMAP, NOMAP, R }, + LM93_SYSCTL_VID2, VALUE(1), 3, "cpu1_vid", 3, "vid2" }, { { SENSORS_LM93_ALARMS, "alarms", NOMAP, NOMAP, R }, LM93_SYSCTL_ALARMS, VALUE(1), 0 }, { { 0 }, 0 }