summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-06 15:55:31 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-06 15:55:31 +0000
commit2bb7ccf668ab0e36c2db865722771062f4af7f62 (patch)
tree9ed864c1b16fbf68200258953687d790f06ef10d
parent90afa984baae658b977afbaf6f52ff70d2665127 (diff)
downloaddrakx-2bb7ccf668ab0e36c2db865722771062f4af7f62.tar
drakx-2bb7ccf668ab0e36c2db865722771062f4af7f62.tar.gz
drakx-2bb7ccf668ab0e36c2db865722771062f4af7f62.tar.bz2
drakx-2bb7ccf668ab0e36c2db865722771062f4af7f62.tar.xz
drakx-2bb7ccf668ab0e36c2db865722771062f4af7f62.zip
fix displaying in proper category sound coprocessor & misc ACPI event
keys NEWS harddrake [backported from trunk]
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d51a67047..6e3f87620 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -9,6 +9,7 @@
* list PC Speaker as sound card
* track duplicated input devices
* try harder to find duplicates
+ o fix displaying in proper category sound coprocessor & misc ACPI event keys
Version 11.71.2 - 5 December 2008
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d02028eac..dd8686752 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -312,7 +312,7 @@ our @tree =
detector => sub {
require list_modules;
my @modules = list_modules::category2modules('multimedia/sound');
- f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ || member($_->{driver}, @modules)
+ f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO|PROCESSOR_CO/ || member($_->{driver}, @modules)
|| $_->{description} =~ /PC Speaker/ } @devices);
},
checked_on_boot => 1,
@@ -487,7 +487,7 @@ our @tree =
detector => sub {
f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i ||
# USB devices are filtered out since we already catch them through probeall():
- $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/;
+ $_->{bus} ne 'usb' && $_->{driver} =~ /^event|kbd/ && $_->{description} !~ /PC Speaker/;
} @devices);
},
checked_on_boot => 0,