hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree fd869c8ba653bdba21cb404780989a420ca5857d (from 58b9a7041771f64bff6dde386cd2364205bd65d4)
Author: Aurélien Bompard <gauret at free.fr>
Date:   Tue Jul 10 09:56:24 2007 +0100

    add keymap for hp nc6320
    
    This one is really straightforward, it's a simple copy from the 6120 definition.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 07ed507..51d826f 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -13,6 +13,12 @@
           <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
+          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
+          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
+          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>
   </device>