diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-06 23:31:48 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-06 23:31:48 -0700 |
| commit | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (patch) | |
| tree | c30f3c27cb719f1e268f485640cfab9898557676 /drivers/input/tablet/Makefile | |
| parent | Input: hyperv-keyboard - register as a wakeup source (diff) | |
| parent | Input: wacom - only register once the MODULE_* macros (diff) | |
| download | linux-fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae.tar.gz linux-fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae.zip | |
Merge branch 'wacom' into next
Merge large update to Wacom driver, converting it from USB to a HID
driver and unifying wired and bluetooth support, from Benjamin
Tissoires.
Diffstat (limited to 'drivers/input/tablet/Makefile')
| -rw-r--r-- | drivers/input/tablet/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/tablet/Makefile b/drivers/input/tablet/Makefile index 4d9339fb3b63..2e130101cf3c 100644 --- a/drivers/input/tablet/Makefile +++ b/drivers/input/tablet/Makefile @@ -2,13 +2,10 @@ # Makefile for the tablet drivers # -# Multipart objects. -wacom-objs := wacom_wac.o wacom_sys.o obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o 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_WACOM) += wacom.o obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o |