hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |   30 +++++-----
 1 files changed, 15 insertions(+), 15 deletions(-)

New commits:
diff-tree cb12cd0dee336221f3fcf538e6ba23900ac68080 (from eb52a65be0891c716a9a875226bc25fbe65c6743)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jul 25 16:56:27 2007 +0100

    correct sony keymaps
    
    When merging upstream to linus sony-laptop changed the
    msc scancodes. Correct the existing keymaps.
    This is what happens when development goes fast, sorry.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 2a01075..1608eb1 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -7,26 +7,26 @@
     <match key="input.product" string="Sony Vaio Keys">
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-S1XP(GB)">
-          <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
-          <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
-          <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
-          <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
-          <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
-          <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
-          <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+          <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+          <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+          <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">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+          <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
-          <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
-          <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
-          <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
-          <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
-          <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
-          <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
-          <append key="input.keymap.data" type="strlist">0x15:zoom</append> <!-- Fn+F10 zoom -->
-          <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+          <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+          <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+          <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">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 -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>