Minor fixes

* No more redefined complaints of MODULE_* symbols for 2.0 kernels
  This was introduced by the last archive of Simon
* Correct load order of adapters in detect script modprobe report
  You can't assume things come out of a hash in the same order as you
  put them in, of course :-(


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@303 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Frodo Looijaard committed 1999-03-10 20:31:58 +00:00
1 parent 88814e799c
commit a9a3659fe9
4 files changed
+14 -8

No files matched your search

+1 -1
View File
@@ -26,8 +26,8 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/malloc.h>
#include "compat.h"
#include "i2c.h"
#include "compat.h"
#include "smbus.h"
#include "i2c-isa.h"
#include "sensors.h"
+1 -1
View File
@@ -25,10 +25,10 @@
#include <linux/proc_fs.h>
#include "version.h"
#include "compat.h"
#include "i2c.h"
#include "i2c-isa.h"
#include "sensors.h"
#include "compat.h"
#ifdef MODULE
+6 -3
View File
@@ -1389,7 +1389,7 @@ sub generate_modprobes
{
my ($prefer_isa) = @_;
my ($chip,$detection,%adapters,$nr,@optionlist);
my ($chip,$detection,%adapters,$nr,$i,@optionlist);
my $modprobes = "";
my $configfile = "";
@@ -1414,8 +1414,11 @@ sub generate_modprobes
not (exists $detection->{i2c_driver} and not $prefer_isa);
}
}
foreach $detection (keys %adapters) {
$modprobes .= "modprobe $detection\n";
for ($i = 0; $i < $nr; $i ++) {
foreach $detection (keys %adapters) {
$modprobes .= "modprobe $detection\n", last
if $adapters{$detection} == $i;
}
}
# Now determine the chip probe lines
+6 -3
View File
@@ -1389,7 +1389,7 @@ sub generate_modprobes
{
my ($prefer_isa) = @_;
my ($chip,$detection,%adapters,$nr,@optionlist);
my ($chip,$detection,%adapters,$nr,$i,@optionlist);
my $modprobes = "";
my $configfile = "";
@@ -1414,8 +1414,11 @@ sub generate_modprobes
not (exists $detection->{i2c_driver} and not $prefer_isa);
}
}
foreach $detection (keys %adapters) {
$modprobes .= "modprobe $detection\n";
for ($i = 0; $i < $nr; $i ++) {
foreach $detection (keys %adapters) {
$modprobes .= "modprobe $detection\n", last
if $adapters{$detection} == $i;
}
}
# Now determine the chip probe lines