hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 872bff02fbdd0144d14c01a940bd2703a198f2de
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 19 13:06:19 2007 +0100

    fixed usage of contains_outof in Acer keymap file
    
    Fixed usage of contains_outof in Acer keymap file, don't use it, if
    it's not needed.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 09eb94f..f26f969 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -9,7 +9,7 @@
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
           <!-- Laptops without extra Euro and Dollar keys, pre mid-2004 & pre 'folio' design -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1510">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1510">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -92,7 +92,7 @@
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa">
           <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4010">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4010">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -110,7 +110,7 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4100">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4100">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->