From 96647a6995538b202e32677dbf80b9014e7233d1 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 9 Oct 2007 11:32:39 +0000
Subject: [PATCH] The ADM1024 will be supported by the lm87 driver in Linux
 2.6.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4930 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/detect/sensors-detect | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index c1d42133..038265ab 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -1092,12 +1092,6 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x);
        i2c_addrs => [0x2c..0x2d],
        i2c_detect => sub { adm1025_detect(1, @_); },
      },
-     {
-       name => "Analog Devices ADM1024",
-       driver => "adm1024",
-       i2c_addrs => [0x2c..0x2e],
-       i2c_detect => sub { adm1024_detect(0, @_); },
-     },
      {
        name => "Analog Devices ADM1021",
        driver => "adm1021",
@@ -1491,6 +1485,12 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x);
 # the chip_special_cases routine below
 use vars qw(@chip_kern24_ids @chip_kern26_ids);
 @chip_kern24_ids = (
+     {
+       name => "Analog Devices ADM1024",
+       driver => "adm1024",
+       i2c_addrs => [0x2c..0x2e],
+       i2c_detect => sub { adm1024_detect(0, @_); },
+     },
      {
        name => "Winbond W83791D",
        driver => "w83781d",
@@ -1512,6 +1512,12 @@ use vars qw(@chip_kern24_ids @chip_kern26_ids);
 );
 
 @chip_kern26_ids = (
+     {
+       name => "Analog Devices ADM1024",
+       driver => "lm87",
+       i2c_addrs => [0x2c..0x2e],
+       i2c_detect => sub { adm1024_detect(0, @_); },
+     },
      {
        name => "Winbond W83791D",
        driver => "w83791d",