summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 21:26:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 21:26:52 -0400
commit1e345ac6869cd2f2d5d4b780fc5d5332dd1e8905 (patch)
treeeeb7d4faa5fdc5e27fd024c65384f11d515fe90f /drivers/input/mouse/Makefile
parent39520eea198a7fbba35f4c7cffb4323f78455716 (diff)
parent447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (diff)
downloadblackbird-op-linux-1e345ac6869cd2f2d5d4b780fc5d5332dd1e8905.tar.gz
blackbird-op-linux-1e345ac6869cd2f2d5d4b780fc5d5332dd1e8905.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "A few new haptic/button drivers, a rudimentary support for laptops using FocalTech touchpads; xpad driver will bind to more devices, and a few other driver fixes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: soc_button_array - convert to platform bus Input: palmas-pwrbutton - fix typo in the license string Input: palmas-pwrbutton - use IRQF_ONESHOT Input: psmouse - add support for detecting FocalTech PS/2 touchpads Input: psmouse - add psmouse_matches_pnp_id helper function Input: joystick - use ktime for measuring timing Input: add haptic driver on max77693 Input: introduce palmas-pwrbutton Input: add support for the DRV2667 haptic driver Input: xpad - sync device IDs with xboxdrv Input: xpad - add VID/PID for Razer Sabertooth Input: cros_ec_keyb - optimize ghosting algorithm Input: drv260x - fix binding document Input: drv260x - add check for ERM mode and LRA Libraries Input: drv260x - remove unused defines Input: drv260x - add TI drv260x haptics driver
Diffstat (limited to 'drivers/input/mouse/Makefile')
-rw-r--r--drivers/input/mouse/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index c25efdb3f288..dda507f8b3a2 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_MOUSE_SYNAPTICS_I2C) += synaptics_i2c.o
obj-$(CONFIG_MOUSE_SYNAPTICS_USB) += synaptics_usb.o
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
-psmouse-objs := psmouse-base.o synaptics.o
+psmouse-objs := psmouse-base.o synaptics.o focaltech.o
psmouse-$(CONFIG_MOUSE_PS2_ALPS) += alps.o
psmouse-$(CONFIG_MOUSE_PS2_ELANTECH) += elantech.o
OpenPOWER on IntegriCloud