hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-dell.fdi |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 7a8a35b97e96355f292d10e5db280116e281c7e0
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Apr 23 16:24:28 2008 +0200

    merged keymaps of Dell D820 to existing of D420
    
    Merged keymaps of Dell D820 to existing of D420.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 022d6b3..3b13489 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -8,7 +8,7 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="D420;D820">
             <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
             <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
             <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
@@ -51,16 +51,6 @@
             <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
         </match> <!-- prefix="Latitude" -->
 
 	<!-- Dell Inspiron 9400, 640m, E1505/6400 -->