diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-08 09:32:45 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-08 09:32:45 -0700 |
| commit | 54a387cb9e600256e50cb9e2209e7e4f06f464de (patch) | |
| tree | 37f2b32b1330f51dbe10ccf4300114c72f7aabdc /include/uapi/linux/input.h | |
| parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) | |
| parent | 0fec08b4ecfc36fd8a64432343b2964fb86d2675 (diff) | |
Merge branch 'for-3.14/core' into for-3.14/drivers
We need the updated code to make bcache easier to merge.
Diffstat (limited to 'include/uapi/linux/input.h')
| -rw-r--r-- | include/uapi/linux/input.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index a3726275876d..ecc88592ecbe 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -719,6 +719,8 @@ struct input_keymap_entry { #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 +#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 @@ -856,6 +858,7 @@ struct input_keymap_entry { #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ +#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_MAX 0x0f #define SW_CNT (SW_MAX+1) |