Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov: "The second round of updates for the input subsystem. Updates to ALPS an bfin_roraty drivers and a couple oother fixups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - use IS_ENABLED instead of homegrown code Input: bfin_rotary - introduce open and close methods Input: bfin_rotary - convert to use managed resources Input: bfin_rotary - use generic IO functions Input: bfin_rotary - move pin lists into into platform data Input: bfin_rotary - move platform header to linux/platform_data Input: bfin_rotary - mark suspend and resume code as __maybe_unused Input: bfin_rotary - fix potential oops in interrupt handler Input: ALPS - move v7 packet info to Documentation and v6 packet info Input: ALPS - fix confusing comment in protocol data Input: ALPS - do not mix trackstick and external PS/2 mouse data Input: ALP...
Showing
- Documentation/input/alps.txt 66 additions, 2 deletionsDocumentation/input/alps.txt
- arch/blackfin/mach-bf527/boards/ad7160eval.c 14 additions, 1 deletionarch/blackfin/mach-bf527/boards/ad7160eval.c
- arch/blackfin/mach-bf527/boards/ezkit.c 14 additions, 1 deletionarch/blackfin/mach-bf527/boards/ezkit.c
- arch/blackfin/mach-bf548/boards/ezkit.c 6 additions, 1 deletionarch/blackfin/mach-bf548/boards/ezkit.c
- arch/blackfin/mach-bf609/boards/ezkit.c 6 additions, 1 deletionarch/blackfin/mach-bf609/boards/ezkit.c
- drivers/input/joystick/adi.c 1 addition, 2 deletionsdrivers/input/joystick/adi.c
- drivers/input/keyboard/pxa27x_keypad.c 1 addition, 3 deletionsdrivers/input/keyboard/pxa27x_keypad.c
- drivers/input/misc/bfin_rotary.c 117 additions, 91 deletionsdrivers/input/misc/bfin_rotary.c
- drivers/input/misc/soc_button_array.c 1 addition, 1 deletiondrivers/input/misc/soc_button_array.c
- drivers/input/mouse/alps.c 306 additions, 210 deletionsdrivers/input/mouse/alps.c
- drivers/input/mouse/alps.h 41 additions, 24 deletionsdrivers/input/mouse/alps.h
- drivers/input/mouse/cypress_ps2.c 0 additions, 5 deletionsdrivers/input/mouse/cypress_ps2.c
- drivers/input/mouse/cypress_ps2.h 0 additions, 5 deletionsdrivers/input/mouse/cypress_ps2.h
- drivers/input/mouse/focaltech.c 0 additions, 10 deletionsdrivers/input/mouse/focaltech.c
- drivers/input/mouse/focaltech.h 0 additions, 1 deletiondrivers/input/mouse/focaltech.h
- drivers/input/mouse/psmouse-base.c 3 additions, 3 deletionsdrivers/input/mouse/psmouse-base.c
- drivers/input/mouse/synaptics.c 0 additions, 10 deletionsdrivers/input/mouse/synaptics.c
- drivers/input/mouse/synaptics.h 0 additions, 1 deletiondrivers/input/mouse/synaptics.h
- include/linux/platform_data/bfin_rotary.h 1 addition, 0 deletionsinclude/linux/platform_data/bfin_rotary.h
Please register or sign in to comment