From f35eed39d47c17872b7c86aa84bead76c7d469e6 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 20 Oct 2007 08:34:25 +0000 Subject: [PATCH] Rename fsc-specific chip arrays to something clearer. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4964 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/detect/sensors-detect | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index a054447e..41d6dfeb 100644 --- a/CHANGES +++ b/CHANGES @@ -43,6 +43,7 @@ SVN HEAD Fix SMSC SCH311x detection Add AMD K10 CPU sensor detection Fix SMSC LPC47B357/M967 detection + Select the right driver for FSC chips 2.10.4 (20070716) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index cf319949..1750aa00 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -1471,8 +1471,8 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x); # Special case chip information goes here and would be included in # the chip_special_cases routine below -use vars qw(@chip_kern24_ids @chip_kern26_ids @chip_kern_lt_26_24_ids - @chip_kern_gt_eq_26_24_ids); +use vars qw(@chip_kern24_ids @chip_kern26_ids + @chip_oldfsc_ids @chip_fschmd_ids); @chip_kern24_ids = ( { name => "Analog Devices ADM1024", @@ -1528,7 +1528,7 @@ use vars qw(@chip_kern24_ids @chip_kern26_ids @chip_kern_lt_26_24_ids ); # sigh special case for old seperate FSC drivers to new merged one mapping -@chip_kern_lt_26_24_ids = ( +@chip_oldfsc_ids = ( { name => "FSC Poseidon I", driver => "fscpos", @@ -1549,7 +1549,7 @@ use vars qw(@chip_kern24_ids @chip_kern26_ids @chip_kern_lt_26_24_ids }, ); -@chip_kern_gt_eq_26_24_ids = ( +@chip_fschmd_ids = ( { name => "FSC Poseidon I", driver => "fschmd", @@ -3475,9 +3475,9 @@ sub chip_special_cases # Based on the kernel, add the appropriate chip structures to the # chip_ids detection list if (kernel_version_at_least(2, 6, 24)) { - push @chip_ids, @chip_kern_gt_eq_26_24_ids; + push @chip_ids, @chip_fschmd_ids; } else { - push @chip_ids, @chip_kern_lt_26_24_ids; + push @chip_ids, @chip_oldfsc_ids; } if (kernel_version_at_least(2, 6, 0)) {