hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-misc.fdi |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 8dd51823d1e425dadc80a76971ef8f68cd82447a
Author: Paul Menzel <pm.debian at googlemail.com>
Date:   Fri Jan 25 16:21:30 2008 +0100

    hal-info keyboard support for BenQ R22e
    
    Added new keymap quirks to support a BenQ R22e. For the whole
    discussion see: http://thread.gmane.org/gmane.comp.freedesktop.hal/9265

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index aabac24..ee12775 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -6,6 +6,15 @@
     <!-- These are raw scancodes produced by the atkbd driver -->
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains="BenQ">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="Joybook R22">
+          <append key="input.keymap.data" type="strlist">6e:wlan</append> <!-- Fn + F1 wireless network radio on and off. -->
+          <!-- <append key="input.keymap.data" type="strlist">6d:brightnessdown</append> (Fn + F6 brightness down.) -->
+          <!-- <append key="input.keymap.data" type="strlist">6d:brightnessup</append> (Fn + F7 brightness. up) -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MEDION">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060">
           <append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down -->