diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
| commit | 01c728a246a1072fe9664b91179a47937182b0a0 (patch) | |
| tree | ca1e1d997284777b28981040dae97ee668aadaee /include/linux/input.h | |
| parent | 554738da71004d96e06fb75f4772dfc3b0f47810 (diff) | |
| parent | 50a88cb7eddb971077ae7dff76b116747c12c371 (diff) | |
| download | linux-01c728a246a1072fe9664b91179a47937182b0a0.tar.gz linux-01c728a246a1072fe9664b91179a47937182b0a0.tar.bz2 linux-01c728a246a1072fe9664b91179a47937182b0a0.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 84d4ce0d983a..ea3a329886df 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -800,6 +800,7 @@ struct input_keymap_entry { #define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ #define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ +#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ #define SW_MAX 0x0f #define SW_CNT (SW_MAX+1) |