summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2011-07-21 19:38:10 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2011-07-21 19:38:10 +0000
commitf1c013be181c55b9df09263541ab89f76551150f (patch)
tree33980dbfba85a828c7788055eb5551465afb34cb
parent1418fcbccdfdeef42a458ba2bb4b44b1257c3537 (diff)
downloadlm-sensors-f1c013be181c55b9df09263541ab89f76551150f.tar.gz
Major kernel version number was bumped to 3.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5985 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--doc/progs2
-rw-r--r--doc/svn6
-rwxr-xr-xetc/sensors-conf-convert2
-rw-r--r--prog/hotplug/README.p4b7
-rwxr-xr-xprog/hotplug/unhide_ICH_SMBus2
5 files changed, 9 insertions, 10 deletions
diff --git a/doc/progs b/doc/progs
index 6ef5c009..080f461f 100644
--- a/doc/progs
+++ b/doc/progs
@@ -25,7 +25,7 @@ see http://www.lm-sensors.org/wiki/UsefulLinks.
isadump -k 0x55 0x2e 0x2f
* prog/hotplug/unhide_ICH_SMBus (shell script, not installed)
- It unhides the ICH Intel SMBus for 2.6 kernels
+ It unhides the ICH Intel SMBus for kernel 2.6.5 and later.
* prog/init/lm_sensors.init (shell script, not installed)
A SysV init script to be installed in /etc/rc.d/init.d/
diff --git a/doc/svn b/doc/svn
index 8e8f94ae..2f0b1a84 100644
--- a/doc/svn
+++ b/doc/svn
@@ -4,9 +4,9 @@ Anonymous access to our Subversion repository (SVN) is available. This means
that users can have direct access to up-to-the-minute code.
(http://subversion.tigris.org/)
-Driver development for 2.6 kernels is taking place directly in the kernel
-using GIT. Do not use the drivers from our SVN repository for 2.6 kernels, it
-will not work. The user-space tools will work though.
+Driver development for kernel version 3 is taking place directly in the kernel
+using GIT. Do not use the drivers from our SVN repository for kernel version
+2.6 or 3, it will not work. The user-space tools will work though.
We presume that you have Subversion installed on your machine. To check out a
working copy of the code for this project use the following commands:
diff --git a/etc/sensors-conf-convert b/etc/sensors-conf-convert
index fb21c6d4..b7034496 100755
--- a/etc/sensors-conf-convert
+++ b/etc/sensors-conf-convert
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w -pi.old
# Convert a sensors.conf file from the old (Linux 2.4, lm-sensors 2)
-# symbol names to the new (Linux 2.6, lm-sensors 3) symbol names.
+# symbol names to the new (Linux 2.6 or 3, lm-sensors 3) symbol names.
#
# Copyright (C) 2007 Jean Delvare <khali@linux-fr.org>
#
diff --git a/prog/hotplug/README.p4b b/prog/hotplug/README.p4b
index eb43a0e7..bb180c81 100644
--- a/prog/hotplug/README.p4b
+++ b/prog/hotplug/README.p4b
@@ -3,7 +3,7 @@ What is it?
It unhides the SMBus of Intel ICH southbridges hidden on Asus P4B series
and some other Asus and non-Asus systems. It is implemented as a shell
-script for the 2.6 kernel: unhide_ICH_SMBus.
+script for kernel 2.6.5 and later: unhide_ICH_SMBus.
It works with the following chips:
* ICH2 (82801BA)
@@ -19,9 +19,8 @@ with the German support and learned that: "We do not want the users to be
irritated by just another PCI Device in the Win98 device manager."
Really funny :-).
-For 2.6 kernels, activation is normally handled by the code in
-drivers/pci/quirks.c in the kernel source. If you have the 2.6 kernel and
-the quirks code does not activate your SMBus, you may:
+Activation is normally handled by the code in drivers/pci/quirks.c in the
+kernel source. If the quirks code does not activate your SMBus, you may:
* first of all, read the paragraph "Hidden ICH SMBus" in
Documentation/i2c/busses/i2c-i801 in the kernel source.
diff --git a/prog/hotplug/unhide_ICH_SMBus b/prog/hotplug/unhide_ICH_SMBus
index 3b0034a6..099d1a00 100755
--- a/prog/hotplug/unhide_ICH_SMBus
+++ b/prog/hotplug/unhide_ICH_SMBus
@@ -43,7 +43,7 @@ fi
modprobe fakephp &> /dev/null
if [ ! -d "$pcibus" ] ; then
- echo "You need the fake PCI hotplug driver! (fakephp.ko and 2.6 kernel)"
+ echo "You need the fake PCI hotplug driver! (fakephp.ko, kernel 2.6.5 or later)"
exit 255;
fi