diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:31:48 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:31:48 -0400 |
| commit | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (patch) | |
| tree | c30f3c27cb719f1e268f485640cfab9898557676 /drivers/input/tablet/Makefile | |
| parent | 62238f3aadc9bc56da70100e19ec61b9f8d72a5f (diff) | |
| parent | f2e0a7d4a0b94b4274e3b7e15bf650d45a866f3c (diff) | |
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 @@ | |||
| 2 | # Makefile for the tablet drivers | 2 | # Makefile for the tablet drivers |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Multipart objects. | ||
| 6 | wacom-objs := wacom_wac.o wacom_sys.o | ||
| 7 | 5 | ||
| 8 | obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o | 6 | obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o |
| 9 | obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o | 7 | obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o |
| 10 | obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o | 8 | obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o |
| 11 | obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o | 9 | obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o |
| 12 | obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o | 10 | obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o |
| 13 | obj-$(CONFIG_TABLET_USB_WACOM) += wacom.o | ||
| 14 | obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o | 11 | obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o |