hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e0d95232f8f363b7f08f1b21c7ff5ac74621ee5a
Author: Bjørn Mork <bjorn at mork.no>
Date:   Sun Jun 28 22:13:37 2009 +0200

    fix ThinkPad Fn+F5 wlan key
    
    hal-info maps the Fn+F5 Thinkpad key to KEY_RADIO, which is
    a) not correct
    b) outside the X input usable range
    
    This is reported as bugs
     http://bugs.freedesktop.org/show_bug.cgi?id=20153
     http://bugs.debian.org/504643
    
    The attached patch fixes the problem by changing the mapping to
    KEY_WLAN.

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 9710d9d..b60b13e 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -8,7 +8,7 @@
         <append key="input.keymap.data" type="strlist">0x01:battery</append> <!-- Fn+F2 battery -->
         <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
         <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
-        <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch radio -->
+        <append key="input.keymap.data" type="strlist">0x04:wlan</append> <!-- Fn+F5 switch radio -->
         <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
         <append key="input.keymap.data" type="strlist">0x07:zoom</append> <!-- Fn+F8 screen expand -->
         <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
@@ -28,7 +28,7 @@
         <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
         <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
         <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
-        <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
+        <append key="input.keymap.data" type="strlist">0x04:wlan</append> <!-- Fn+F5 wifi -->
         <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
         <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
         <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->