Updating branch refs/heads/master
to aca50818a0e557685ac0f4e5456b7e963cdf6fb7 (commit)
from 889eba6bf97ebef83b7a0fc65d40e86f434eb9db (commit)
commit aca50818a0e557685ac0f4e5456b7e963cdf6fb7
Author: Fabian <[email protected]>
Date: Sat May 12 12:17:43 2012 +0200
support both linux >=2.5 and 3.x in hddtemp
lib/hddtemp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/hddtemp.c b/lib/hddtemp.c
index 6bd3038..e61eb3c 100644
--- a/lib/hddtemp.c
+++ b/lib/hddtemp.c
@@ -428,7 +428,7 @@ initialize_hddtemp (GPtrArray *chips, gboolean
*suppressmessage)
/* Note: This is actually supposed to be carried out by ifdef HAVE_LINUX
and major/minor number stuff from compile time*/
- if (strcmp(p_uname->sysname, "Linux")==0 && major>=5)
+ if (strcmp(p_uname->sysname, "Linux")==0 && (generation>=3 ||
(generation==2 && major>=5)))
read_disks_linux26 (chip);
else
read_disks_fallback (chip); /* hopefully, that's a safe variant */
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
