From bbe8b9729e49501200342cf63acc1c5d71475710 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 7 Sep 2011 18:04:10 +0000
Subject: (default_packages) merge cpufreq detection logic into
 detect_devices::hasCPUFreq(), which is cleaner and enable us to install
 cpufreq on more cases

---
 perl-install/detect_devices.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 49ed09cab..3ad459054 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1254,7 +1254,12 @@ sub hasCPUMicrocode() {
     return $hasCPUMicrocode;
 }
 
-sub hasCPUFreq()     { require cpufreq; to_bool(cpufreq::get_modules()) }
+sub hasCPUFreq()     {
+    require cpufreq;
+     to_bool(cpufreq::get_modules())
+       || cat_('/proc/cpuinfo') =~ /AuthenticAMD/ && arch() =~ /x86_64/
+       || cat_('/proc/cpuinfo') =~ /model name.*Intel\(R\) Core\(TM\)2 CPU/;
+}
 sub hasWacom()     { find { $_->{vendor} == 0x056a || $_->{driver} =~ /wacom/ } usb_probe() }
 sub hasTouchpad()  { any { $_->{Synaptics} || $_->{ALPS} || $_->{Elantech} } getInputDevices() }
 sub hasNumpad()    { any { $_->{Numpad} } getInputDevices() }
-- 
cgit v1.2.1