diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 12:02:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 12:02:44 -0400 |
| commit | 15439dd37f92f930ac7fc65a4f261834e4215bb0 (patch) | |
| tree | ec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7 /include/linux/input.h | |
| parent | 39ab9ddeb3e9573a1ea9a17a1431ea5c81681964 (diff) | |
| parent | 90d95ef617a535a8832bdcb8dee07bf591e5dd82 (diff) | |
Merge branch 'for-linus' into next
Conflicts:
drivers/input/mouse/appletouch.c
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index af9c6314153b..3e86b61d2e4c 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -639,7 +639,9 @@ struct input_absinfo { | |||
| 639 | #define SW_LID 0x00 /* set = lid shut */ | 639 | #define SW_LID 0x00 /* set = lid shut */ |
| 640 | #define SW_TABLET_MODE 0x01 /* set = tablet mode */ | 640 | #define SW_TABLET_MODE 0x01 /* set = tablet mode */ |
| 641 | #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ | 641 | #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ |
| 642 | #define SW_RADIO 0x03 /* set = radio enabled */ | 642 | #define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" |
| 643 | set = radio enabled */ | ||
| 644 | #define SW_RADIO SW_RFKILL_ALL /* deprecated */ | ||
| 643 | #define SW_MAX 0x0f | 645 | #define SW_MAX 0x0f |
| 644 | #define SW_CNT (SW_MAX+1) | 646 | #define SW_CNT (SW_MAX+1) |
| 645 | 647 | ||