diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 19:25:05 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 19:25:05 +0200 |
commit | cd636458904a04de2349c728323c5d2af1203bdf (patch) | |
tree | 69980d8ff803069c38d16a0d3e6932ed2a4aa5c8 /drivers/input/joystick/Makefile | |
parent | Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs (diff) | |
parent | Input: cros_ec_keyb - remove extraneous 'const' (diff) | |
download | linux-cd636458904a04de2349c728323c5d2af1203bdf.tar.xz linux-cd636458904a04de2349c728323c5d2af1203bdf.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull some more input subsystem updates from Dmitry Torokhov:
"An updated xpad driver with a few more recognized device IDs, and a
new psxpad-spi driver, allowing connecting Playstation 1 and 2 joypads
via SPI bus"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: cros_ec_keyb - remove extraneous 'const'
Input: add support for PlayStation 1/2 joypads connected via SPI
Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth
Input: xpad - sync supported devices with xboxdrv
Input: xpad - sort supported devices by USB ID
Diffstat (limited to 'drivers/input/joystick/Makefile')
-rw-r--r-- | drivers/input/joystick/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index 92dc0de9dfed..496fd56b3f1b 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_JOYSTICK_INTERACT) += interact.o obj-$(CONFIG_JOYSTICK_JOYDUMP) += joydump.o obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o obj-$(CONFIG_JOYSTICK_MAPLE) += maplecontrol.o +obj-$(CONFIG_JOYSTICK_PSXPAD_SPI) += psxpad-spi.o obj-$(CONFIG_JOYSTICK_SIDEWINDER) += sidewinder.o obj-$(CONFIG_JOYSTICK_SPACEBALL) += spaceball.o obj-$(CONFIG_JOYSTICK_SPACEORB) += spaceorb.o |