diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:51:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:51:43 -0400 |
| commit | 393bfca19ecdce60a8d9a4d2577cac11ca924a25 (patch) | |
| tree | a609269ca3332b8f2f7b2b4a2c96f7d824c0e639 /include | |
| parent | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (diff) | |
| parent | ba0acb5ee318901646f82c134cca2e4de0c43934 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
Input: move USB miscellaneous devices under drivers/input/misc
Input: move USB mice under drivers/input/mouse
Input: move USB gamepads under drivers/input/joystick
Input: move USB touchscreens under drivers/input/touchscreen
Input: move USB tablets under drivers/input/tablet
Input: i8042 - fix AUX port detection with some chips
Input: aaed2000_kbd - convert to use polldev library
Input: drivers/usb/input - usb_buffer_free() cleanup
Input: synaptics - don't complain about failed resets
Input: pull input.h into uinpit.h
Input: drivers/usb/input - fix sparse warnings (signedness)
Input: evdev - fix some sparse warnings (signedness, shadowing)
Input: drivers/joystick - fix various sparse warnings
Input: force feedback - make sure effect is present before playing
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/uinput.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 1fd61eeed664..a6c1e8eed226 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h | |||
| @@ -32,6 +32,8 @@ | |||
| 32 | * - first public version | 32 | * - first public version |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/input.h> | ||
| 36 | |||
| 35 | #define UINPUT_VERSION 3 | 37 | #define UINPUT_VERSION 3 |
| 36 | 38 | ||
| 37 | #ifdef __KERNEL__ | 39 | #ifdef __KERNEL__ |