From b3c97e6eb83dd33b85975b548a5b57bd6a54ff27 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 26 Nov 2008 10:51:22 +0000
Subject: [PATCH] As of kernel 2.6.28, alias detection is handled by kernel
 drivers directly, so module options are no longer needed.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5432 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                    |  1 +
 prog/detect/sensors-detect | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7fd8358e..a7fe9525 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ SVN-HEAD
                   Merge both GL518SM entries into one
                   Complete GL520SM detection
                   Improve GL525SM detection a bit
+                  Let kernel 2.6.28 and later handle chips aliases
 
 3.0.3 (2008-09-28)
   libsensors: Avoid namespace pollution
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index ea6e9080..32c8fc2c 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -5249,12 +5249,16 @@ sub generate_modprobes
     }
 
     # Handle aliases
-    foreach $detection (@{$chip->{detected}}) {
-      if (exists $detection->{i2c_driver} and
-          exists $detection->{isa_addr} and
-          exists $i2c_adapters[$detection->{i2c_devnr}]->{nr_later}) {
-        push @optionlist, $i2c_adapters[$detection->{i2c_devnr}]->{nr_later},
-                          $detection->{i2c_addr};
+    # As of kernel 2.6.28, alias detection is handled by kernel drivers
+    # directly, so module options are no longer needed.
+    unless (kernel_version_at_least(2, 6, 28)) {
+      foreach $detection (@{$chip->{detected}}) {
+        if (exists $detection->{i2c_driver} and
+            exists $detection->{isa_addr} and
+            exists $i2c_adapters[$detection->{i2c_devnr}]->{nr_later}) {
+          push @optionlist, $i2c_adapters[$detection->{i2c_devnr}]->{nr_later},
+                            $detection->{i2c_addr};
+        }
       }
     }