27 lines
912 B
Diff
27 lines
912 B
Diff
--- lm_sensors-2.10.0/prog/dump/isadump.c.kernel26 2006-05-12 15:26:05.000000000 +0200
|
|
+++ lm_sensors-2.10.0/prog/dump/isadump.c 2006-05-12 16:45:44.000000000 +0200
|
|
@@ -36,12 +36,7 @@
|
|
#include "superio.h"
|
|
|
|
|
|
-/* To keep glibc2 happy */
|
|
-#if 0 && defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
|
|
#include <sys/io.h>
|
|
-#else
|
|
-#include <asm/io.h>
|
|
-#endif
|
|
|
|
#ifdef __powerpc__
|
|
unsigned long isa_io_base = 0; /* XXX for now */
|
|
--- lm_sensors-2.10.0/prog/detect/sensors-detect.kernel26 2006-05-12 15:24:05.000000000 +0200
|
|
+++ lm_sensors-2.10.0/prog/detect/sensors-detect 2006-05-12 15:24:05.000000000 +0200
|
|
@@ -2034,6 +2034,8 @@
|
|
$modules_conf = '/etc/modules.conf';
|
|
} elsif (-f '/etc/conf.modules') {
|
|
$modules_conf = '/etc/conf.modules';
|
|
+ } elsif (-f '/etc/modprobe.conf') {
|
|
+ $modules_conf = '/etc/modprobe.conf';
|
|
} else { # default
|
|
$modules_conf = '/etc/modules.conf';
|
|
}
|