diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
commit | 0808882863774ab69066d83f49f511606be024e0 (patch) | |
tree | dc5eaab5db6c18e06025356235b0c9ba02bd7a1d /drivers/input/tablet/Makefile | |
parent | e9003c9cfaa17d26991688268b04244adb67ee2b (diff) | |
parent | 0097ff3d5dad1f76c5e1099d849d52509500708c (diff) | |
download | blackbird-obmc-linux-0808882863774ab69066d83f49f511606be024e0.tar.gz blackbird-obmc-linux-0808882863774ab69066d83f49f511606be024e0.zip |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.8 merge window.
Diffstat (limited to 'drivers/input/tablet/Makefile')
-rw-r--r-- | drivers/input/tablet/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/tablet/Makefile b/drivers/input/tablet/Makefile index 2e130101cf3c..200fc4e11987 100644 --- a/drivers/input/tablet/Makefile +++ b/drivers/input/tablet/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o +obj-$(CONFIG_TABLET_USB_PEGASUS) += pegasus_notetaker.o obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o |