hal: Branch 'master'

[David Zeuthen]

 hald/linux/addons/addon-acpi.c |    3 ---
 1 files changed, 3 deletions(-)

New commits:
diff-tree 198d462af5ea36a374954e9975277014b1374093 (from 089d8702d847bd6945fb8a658786c9bf10afbcc1)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed May 23 13:10:45 2007 -0400

    remove brightness-up event from acpi addon for IBM
    
    since the brightness-up event for IBM (Thinkpads) also get emitted via the
    input layer and hotkey-setup HAL now (on actual kernel/systems) emit two
    signals. One from the input device and one from ACPI. This patch removes the
    ACPI event handling for this event.

diff --git a/hald/linux/addons/addon-acpi.c b/hald/linux/addons/addon-acpi.c
index 8643be1..686e6e3 100644
--- a/hald/linux/addons/addon-acpi.c
+++ b/hald/linux/addons/addon-acpi.c
@@ -148,9 +148,6 @@ handle_ibm_acpi_events (LibHalContext *c
 			case 4111: /* Fn+Delete*/ 
 				button = "Fn+Delete";
 				break;
-			case 4112: /* Fn+Home*/ 
-				button = "brightness-up";
-				break;
 			case 20489: /* Tablet rotated */
 				button = "tabletpc_rotate_180";
 				break;