From 2bb7ccf668ab0e36c2db865722771062f4af7f62 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 6 Jan 2009 15:55:31 +0000
Subject: fix displaying in proper category sound coprocessor & misc ACPI event
 keys NEWS harddrake [backported from trunk]

---
 perl-install/NEWS              | 1 +
 perl-install/harddrake/data.pm | 4 ++--
 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,
-- 
cgit v1.2.1