aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-02-01 00:37:30 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-02-01 00:37:30 -0800
commitd67ad78e09cbb9935c74a40b85c5abe5b9cd48f8 (patch)
tree56e92b487de80090a998ff3c0469375982156802 /drivers/input/serio/Makefile
parentRevert "Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01" (diff)
parentInput: goodix - use generic touchscreen_properties (diff)
downloadlinux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.tar.xz
linux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.zip
Merge branch 'next' into for-linus
Prepare input updates for 4.16 merge window.
Diffstat (limited to 'drivers/input/serio/Makefile')
-rw-r--r--drivers/input/serio/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index a3ca07621542..67950a5ccb3f 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_SERIO_CT82C710) += ct82c710.o
obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o
obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o
obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o
-obj-$(CONFIG_SERIO_AT32PSIF) += at32psif.o
obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o
obj-$(CONFIG_HP_SDC) += hp_sdc.o