summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-18 08:31:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-18 08:31:14 -0800
commit83c5aac175e182c30729650f2edee3294c3b8bb0 (patch)
tree33a3ad885a9c74da05b25a97d9cc6b448b07861f /include/linux
parent2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27 (diff)
parent3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: add KEY_RFKILL Input: i8042 - fix KBC jam during hibernate
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/input.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 735ceaf1bc2d..663208afb64c 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -376,6 +376,7 @@ struct input_absinfo {
#define KEY_DISPLAY_OFF 245 /* display device to off state */
#define KEY_WIMAX 246
+#define KEY_RFKILL 247 /* Key that controls all radios */
/* Range 248 - 255 is reserved for special needs of AT keyboard driver */