From 38c72685900dc39712edc57d6a05b9280813652d Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 19 Jun 2008 08:28:25 +0000
Subject: [PATCH] Fix adm1021, adm1023 support with 2.6 kernel. This closes
 ticket #2334.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5285 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES              | 1 +
 prog/sensord/chips.c | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index f1a121bc..04bdbe93 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ SVN-HEAD
   Module w83l785ts: Don't ask user to report failures (2.6 backport)
   Program fancontrol: Don't use named pipes when we don't need them (#2319)
   Program sensord: Add lm90, adm1032, lm99, lm86, max6657, adt7461 support
+                   Fix adm1021, adm1023 support with 2.6 kernel (#2334)
   Program sensors-detect: New device ID for the SMSC SCH5317
                           Add SMSC SCH5127 detection
                           Add National Semiconductor LM64 detection
diff --git a/prog/sensord/chips.c b/prog/sensord/chips.c
index 7e24fd0f..b0fe4156 100644
--- a/prog/sensord/chips.c
+++ b/prog/sensord/chips.c
@@ -44,13 +44,6 @@ fmtExtra
   return buff;
 }
 
-static const char *
-fmtValu_0
-(const double values[], int alarm, int beep) {
-  sprintf (buff, "%.0f", values[0]);
-  return fmtExtra (alarm, beep);
-}
-
 static const char *
 fmtTemps_0
 (const double values[], int alarm, int beep) {
@@ -252,8 +245,6 @@ static const FeatureDescriptor adm1021_features[] = {
     { SENSORS_ADM1021_TEMP, SENSORS_ADM1021_TEMP_HYST, SENSORS_ADM1021_TEMP_OVER, -1 } }, /* hyst=min, over=max */
   { fmtTemps_ADM1021_1, rrdF0, DataType_temperature, ADM1021_ALARM_RTEMP_HIGH | ADM1021_ALARM_RTEMP_LOW | ADM1021_ALARM_RTEMP_NA, 0,
     { SENSORS_ADM1021_REMOTE_TEMP, SENSORS_ADM1021_REMOTE_TEMP_HYST, SENSORS_ADM1021_REMOTE_TEMP_OVER, -1 } }, /* hyst=min, over=max */
-  { fmtValu_0, NULL, DataType_other, 0, 0,
-    { SENSORS_ADM1021_DIE_CODE, -1 } },
   { NULL }
 };