diff --git a/[refs] b/[refs] index b078bf2281f7..48d4407a43d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2d1a2a11b9b29c3be1dd781dc88518ffab8d4be +refs/heads/master: 3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h index 735ceaf1bc2d..663208afb64c 100644 --- a/trunk/include/linux/input.h +++ b/trunk/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 */