hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 7b3485afd2e0582a7d30689d575c0adc88cf028b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Mar 7 15:33:13 2008 +0100

    added keymap for HP Compaq 6910p
    
    Added keymap for HP Compaq 6910p.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index d2ad959..10c455a 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -71,6 +71,12 @@
           <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6910p">
+          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>		<!-- FnEsc -->
+          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
+          <append key="input.keymap.data" type="strlist">e009:battery</append>		<!-- FnF8 (battery) -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nx7300;nx7400">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->