hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi    |    2 +-
 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 443e6d2a19213cb9ac17efe69056d231f271eee5
Author: Sam Morris <sam at robots.org.uk>
Date:   Fri May 23 18:00:38 2008 +0200

    fixed typo in Samsung Q45 video quirk info
    
    I found that the video quirk info for the Samsung Q45 laptop containedi
    a typo. Here is a patch to correct it.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 0ceeb4d..8585303 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -2,7 +2,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix_ncase="Samsung">
-      <match key="system.hardware.product" string_outof="Q35/Q36;SM40S;SQ45S70">
+      <match key="system.hardware.product" string_outof="Q35/Q36;SM40S;SQ45S70S">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
commit caebfa3f92ff06417d3ef2c471386b5ff067d169
Author: Stefano Avallone <stefano.avallone at unina.it>
Date:   Fri May 23 17:58:33 2008 +0200

    keymap for Sony Vaio VGN-FZ39VN
    
    The Sony Vaio VGN-FZ39VN has the same layout as the VGN-FZ140E, so the
    attached patch simply adds "VGN-FZ39VN" to the matching pattern (and
    fixes the comments for brightness up/down).

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 7257e52..e9924a0 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -29,10 +29,10 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
 
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FZ140E">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FZ140E;VGN-FZ39VN">
           <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
-          <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
-          <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
+          <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness down -->
+          <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness up -->
           <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
           <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
           <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->