Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 48937ffa977ad1f3d3a3d5311babe4dc845bbf33..1bdc39a8c76c6a0916af7b6698fdcd219a26c1fb 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -371,6 +371,8 @@ struct input_absinfo {
 #define KEY_BRIGHTNESS_ZERO    244     /* brightness off, use ambient */
 #define KEY_DISPLAY_OFF                245     /* display device to off state */
 
+#define KEY_WIMAX              246
+
 #define BTN_MISC               0x100
 #define BTN_0                  0x100
 #define BTN_1                  0x101