From 00980f98fddff4dcde5f96fd08e20315f0c090d1 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 11 Aug 2006 07:34:32 +0000 Subject: [PATCH] i2c-isa will soon be gone. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4090 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/detect/sensors-detect | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index f075cf87..bd46d8f3 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -5168,7 +5168,7 @@ sub generate_modprobes local $_; while () { my ($dev_nr, $type, $adap) = /^i2c-(\d+)\s+(\S+)\s+(.*?) *(\t|$)/; - next if ($type eq "dummy"); + next if ($type eq "dummy" || $type eq "isa"); $adapters[$dev_nr]->{driver} = find_adapter_driver($adap); $adapters[$dev_nr]->{adapname} = $adap; } @@ -5216,7 +5216,9 @@ sub generate_modprobes last; } } - $modprobes .= "modprobe i2c-isa\n" if ($isa); + # i2c-isa is loaded automatically (as a dependency) since 2.6.14, + # and will soon be gone. + $modprobes .= "modprobe i2c-isa\n" if ($isa && !kernel_version_at_least(2, 6, 18)); if ($bmcsensors) { $modprobes .= "# You must also install and load the IPMI modules\n"; $modprobes .= "modprobe i2c-ipmi\n";