hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 8f466e212fbf39ce1250a085e2db7b1c59de3d5f (from 357e0e5485e2deeae1fa241a6827e66b6ac2498d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 21:59:46 2007 +0200

    added keymap for Hewlett-Packard nx9105
    
    Added keymap for Hewlett-Packard nx9105.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index dea151e..da2bf0a 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -59,6 +59,12 @@
           <append key="input.keymap.data" type="strlist">e033:f22</append>     	<!-- FIXME: Auto brightness -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx9105">
+          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
+          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>
   </device>