hal-info: Branch 'master'

[Matthew Garrett]

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

New commits:
commit 7285f262ffef9635bf4925fe6eb64ef60584be78
Author: Matthew Garrett <mjg at redhat.com>
Date:   Mon Mar 30 14:31:48 2009 +0100

    Make HP brightness keys generic
    
    Recent HP laptops have stopped generating ACPI events for brightness keys,
    so need these mapped. It's safe to make this generic since the keycodes don't
    collide with any existing HP ones.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index da68907..3a36baf 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -16,6 +16,9 @@
           <append key="input.keymap.data" type="strlist">e031:help</append>     <!-- FnF1 (help) -->
           <append key="input.keymap.data" type="strlist">e033:f21</append>      <!-- FIXME: Auto brightness -->
           <append key="input.keymap.data" type="strlist">e057:wlan</append>     <!-- Wlan -->
+	  <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (FnF9 on 6730b) (brightness down) -->
+	  <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (FnF10 on 6730b) (brightness up) -->
+	  <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append>   <!-- FnF4 (video switch) -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
 
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Tablet">
@@ -40,13 +43,6 @@
             <append key="input.keymap.data" type="strlist">e059:help</append>   <!-- I key (high keycode: "info") -->
           </match>
 
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4410s;4411s;4415s;4416s;6730s;6730b;Compaq 5X5">
-            <!-- HP Compaq 4410s, 4415s, 4416s, 6730s, 6730b, Compaq 5X5 -->
-            <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (FnF9 on 6730b) (brightness down) -->
-            <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (FnF10 on 6730b) (brightness up) -->
-	    <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append>   <!-- FnF4 (video switch) -->
-          </match>
-
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
             <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
             <remove key="input.keymap.data" type="strlist">e059:help</remove>