hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    3 +++
 fdi/information/10freedesktop/30-keymap-compaq.fdi     |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 830346628e778fdc2e2f84a29612fbc82e202149
Author: Hans de Goede <j.w.r.degoede at hhs.nl>
Date:   Tue Sep 30 15:55:16 2008 +0200

    add suspend quirk and keymap for a HP Compaq Evo N600C
    
    Added suspend quirk and keymap for a HP Compaq Evo N600C.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 43bb78d..aec484a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -18,6 +18,9 @@
       </match>
 
       <match key="system.hardware.product" prefix="Evo">
+        <match key="system.hardware.product" contains="N600c">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="N800w ">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <!-- VBE_MODE does not work, text size changes -->
diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
index 3516410..40816f5 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_outof="E500;Evo N610c">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="E500;Evo N610c;Evo N600c">
           <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 -->