hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |    2 +-
 fdi/information/10freedesktop/30-keymap-compaq.fdi      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8b35f274866173c774cab2da11fad54e7cfe5cd
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Dec 11 13:01:30 2007 +0100

    fixed usage of prefix_outof
    
    Fixed usage of prefix_outof, use only if really needed.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 98d1a1b..3561a7b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -49,7 +49,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- R52 ATI Mobility Radeon X300 -->
-      <match key="system.hardware.product" prefix_outof="1846">
+      <match key="system.hardware.product" prefix="1846">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
commit 17711e31267a10e3b680d6d065f1efb730426579
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Dec 11 12:57:19 2007 +0100

    added keymap for a Compaq Evo nc610c
    
    Added adopted version of a patch from Alain Spineux <alain.spineux at gmail.com>
    to add a keymap for a Compaq Evo nc610c.

diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
index 012e192..3516410 100644
--- a/fdi/information/10freedesktop/30-keymap-compaq.fdi
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -7,7 +7,7 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="E500;Evo N610c">
           <append key="input.keymap.data" type="strlist">e023:www</append>	<!-- I key -->
           <append key="input.keymap.data" type="strlist">e01a:search</append>	<!-- Search key -->
           <append key="input.keymap.data" type="strlist">e01e:email</append>	<!-- Email -->