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
Showing
- drivers/input/Kconfig 2 additions, 0 deletionsdrivers/input/Kconfig
- drivers/input/Makefile 1 addition, 0 deletionsdrivers/input/Makefile
- drivers/input/evdev.c 3 additions, 3 deletionsdrivers/input/evdev.c
- drivers/input/ff-core.c 2 additions, 1 deletiondrivers/input/ff-core.c
- drivers/input/joystick/Kconfig 16 additions, 2 deletionsdrivers/input/joystick/Kconfig
- drivers/input/joystick/Makefile 1 addition, 0 deletionsdrivers/input/joystick/Makefile
- drivers/input/joystick/analog.c 1 addition, 1 deletiondrivers/input/joystick/analog.c
- drivers/input/joystick/db9.c 9 additions, 9 deletionsdrivers/input/joystick/db9.c
- drivers/input/joystick/gamecon.c 9 additions, 8 deletionsdrivers/input/joystick/gamecon.c
- drivers/input/joystick/iforce/iforce.h 1 addition, 1 deletiondrivers/input/joystick/iforce/iforce.h
- drivers/input/joystick/turbografx.c 10 additions, 8 deletionsdrivers/input/joystick/turbografx.c
- drivers/input/joystick/xpad.c 0 additions, 0 deletionsdrivers/input/joystick/xpad.c
- drivers/input/keyboard/Kconfig 1 addition, 0 deletionsdrivers/input/keyboard/Kconfig
- drivers/input/keyboard/aaed2000_kbd.c 20 additions, 42 deletionsdrivers/input/keyboard/aaed2000_kbd.c
- drivers/input/misc/Kconfig 81 additions, 7 deletionsdrivers/input/misc/Kconfig
- drivers/input/misc/Makefile 7 additions, 2 deletionsdrivers/input/misc/Makefile
- drivers/input/misc/ati_remote.c 0 additions, 0 deletionsdrivers/input/misc/ati_remote.c
- drivers/input/misc/ati_remote2.c 1 addition, 3 deletionsdrivers/input/misc/ati_remote2.c
- drivers/input/misc/keyspan_remote.c 0 additions, 0 deletionsdrivers/input/misc/keyspan_remote.c
- drivers/input/misc/map_to_7segment.h 0 additions, 0 deletionsdrivers/input/misc/map_to_7segment.h
Loading
Please register or sign in to comment