hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-acer.fdi |   38 -----------------------
 1 file changed, 38 deletions(-)

New commits:
commit 98b5527b00ca8dcff8fcc3c6b8aea5604c611b80
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 18 01:04:09 2007 +0200

    Revert "Add the keymap for the Aspire TravelMate 3260"
    
    This reverts commit 8d52c9d560ea4b66238433a3fbf18213ca4e58d1.
    
    Revert one more of the triple applied patches for the Aspire TravelMate
    3260 keymap.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index ecae820..fb202a9 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -167,25 +167,6 @@
             <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-          <!-- TravelMate 3260 -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3260">
-            <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 -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
           <!-- TravelMate 4650 -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4650">
             <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
commit 24c3b73383aabafbd12b3704bbdcef5f971fc4a2
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 18 01:03:31 2007 +0200

    Revert "Add the keymap for the Aspire TravelMate 3260"
    
    This reverts commit 2f7dca55f0ddedf62a11106cb508253cf167099c.
    
    Removed triple applied patch for Aspire TravelMate 3260 keymap.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index dcf1be6..ecae820 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -186,25 +186,6 @@
             <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-          <!-- TravelMate 3260 -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3260">
-            <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 -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
           <!-- TravelMate 4650 -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4650">
             <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->