summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-10-03 16:42:21 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-10-03 16:42:21 -0700
commitc758f96a8c346ac5a6822b521ec92308c5774381 (patch)
tree377b72d74ee58b3e1eeb0528d0618e38645aaafc /drivers/input/keyboard/Makefile
parent9fb6de1b0bf4ec11573b76059da3c3b39ac7f2ff (diff)
parent265d426d7470d53e900379960eef5b4482125089 (diff)
downloadlinux-next-c758f96a8c346ac5a6822b521ec92308c5774381.tar.gz
linux-next-c758f96a8c346ac5a6822b521ec92308c5774381.zip
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/keyboard/Makefile')
-rw-r--r--drivers/input/keyboard/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 1d416ddf84e4..d9f4cfcf3410 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -4,6 +4,7 @@
# Each configuration option enables a list of files.
+obj-$(CONFIG_KEYBOARD_ADC) += adc-keys.o
obj-$(CONFIG_KEYBOARD_ADP5520) += adp5520-keys.o
obj-$(CONFIG_KEYBOARD_ADP5588) += adp5588-keys.o
obj-$(CONFIG_KEYBOARD_ADP5589) += adp5589-keys.o