hal: Branch 'master'

[Martin Pitt]

 hald/linux/addons/addon-input.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 763582c7b20dedfce622854e82c449950cca70b0
Author: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
Date:   Thu May 28 10:40:19 2009 +0200

    addon-input: add KEY_ZOOM
    
    Reported on hal ML.

diff --git a/hald/linux/addons/addon-input.c b/hald/linux/addons/addon-input.c
index f6935d3..754a855 100644
--- a/hald/linux/addons/addon-input.c
+++ b/hald/linux/addons/addon-input.c
@@ -175,7 +175,11 @@ static char *key_name[KEY_MAX + 1] = {
 #ifndef KEY_WLAN
 #define KEY_WLAN 238
 #endif
-	[KEY_WLAN] = "wlan"
+	[KEY_WLAN] = "wlan",
+#ifndef KEY_ZOOM
+#define KEY_ZOOM 0x174
+#endif
+	[KEY_ZOOM] = "zoom"
 };