History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov: "A fix for a panic in gpio-keys driver when set up with absolute events, a fixup to the new zforce driver and a new keycode definition" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: allocate absinfo data when setting ABS capability Input: define KEY_WWAN for Wireless WAN Input: zforce - fix possible driver hang during suspend

Linus Torvalds committed 12 years ago

Commit 6b8c9822 parents 03bdeda 28a2a2e3 files · +21 −7Browse files

Showing the changes to include/uapi/linux (1 of 3 files). Show all

Unified · Split

include/uapi/linux/input.h+2−1
@@ -464,7 +464,8 @@ struct input_keymap_entry { · 463 unmodified lines
464464 #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */
465465 #define KEY_DISPLAY_OFF 245 /* display device to off state */
466466
467−#define KEY_WIMAX 246
467+#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */
468+#define KEY_WIMAX KEY_WWAN
468469 #define KEY_RFKILL 247 /* Key that controls all radios */
469470
470471 #define KEY_MICMUTE 248 /* Mute / unmute the microphone */