diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-12 01:01:45 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-12 01:01:45 -0500 |
| commit | 01c728a246a1072fe9664b91179a47937182b0a0 (patch) | |
| tree | ca1e1d997284777b28981040dae97ee668aadaee /include/linux | |
| parent | 554738da71004d96e06fb75f4772dfc3b0f47810 (diff) | |
| parent | 50a88cb7eddb971077ae7dff76b116747c12c371 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input.h | 1 | ||||
| -rw-r--r-- | include/linux/input/as5011.h | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 84d4ce0d983..ea3a329886d 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -800,6 +800,7 @@ struct input_keymap_entry { | |||
| 800 | #define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ | 800 | #define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ |
| 801 | #define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ | 801 | #define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ |
| 802 | #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ | 802 | #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ |
| 803 | #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ | ||
| 803 | #define SW_MAX 0x0f | 804 | #define SW_MAX 0x0f |
| 804 | #define SW_CNT (SW_MAX+1) | 805 | #define SW_CNT (SW_MAX+1) |
| 805 | 806 | ||
diff --git a/include/linux/input/as5011.h b/include/linux/input/as5011.h new file mode 100644 index 00000000000..1affd0ddfa9 --- /dev/null +++ b/include/linux/input/as5011.h | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | #ifndef _AS5011_H | ||
| 2 | #define _AS5011_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Copyright (c) 2010, 2011 Fabien Marteau <fabien.marteau@armadeus.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License version 2 as published by | ||
| 9 | * the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | struct as5011_platform_data { | ||
| 13 | unsigned int button_gpio; | ||
| 14 | unsigned int axis_irq; /* irq number */ | ||
| 15 | unsigned long axis_irqflags; | ||
| 16 | char xp, xn; /* threshold for x axis */ | ||
| 17 | char yp, yn; /* threshold for y axis */ | ||
| 18 | }; | ||
| 19 | |||
| 20 | #endif /* _AS5011_H */ | ||