summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2021-11-11 21:58:54 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-11-11 21:58:54 -0800
commitefe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch)
treeab5a4ac8c5b917b07af95c866770659f330b7f2b /drivers/input/touchscreen/Makefile
parenta02dcde595f7cbd240ccd64de96034ad91cffc40 (diff)
parent744d0090a5f6dfa4c81b53402ccdf08313100429 (diff)
downloadlwn-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.tar.gz
lwn-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
-rw-r--r--drivers/input/touchscreen/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 7d34100f7f22..39a8127cf6a5 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -6,6 +6,7 @@
# Each configuration option enables a list of files.
wm97xx-ts-y := wm97xx-core.o
+goodix_ts-y := goodix.o goodix_fwupload.o
obj-$(CONFIG_TOUCHSCREEN_88PM860X) += 88pm860x-ts.o
obj-$(CONFIG_TOUCHSCREEN_AD7877) += ad7877.o
@@ -44,7 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o
obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL) += egalax_ts_serial.o
obj-$(CONFIG_TOUCHSCREEN_EXC3000) += exc3000.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
-obj-$(CONFIG_TOUCHSCREEN_GOODIX) += goodix.o
+obj-$(CONFIG_TOUCHSCREEN_GOODIX) += goodix_ts.o
obj-$(CONFIG_TOUCHSCREEN_HIDEEP) += hideep.o
obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o
obj-$(CONFIG_TOUCHSCREEN_ILITEK) += ilitek_ts_i2c.o