Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / drivers / hid / Makefile

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 058b5f0..4dbac7f 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -60,7 +60,7 @@ obj-$(CONFIG_HID_KENSINGTON)  += hid-kensington.o
 obj-$(CONFIG_HID_KEYTOUCH)     += hid-keytouch.o
 obj-$(CONFIG_HID_KYE)          += hid-kye.o
 obj-$(CONFIG_HID_LCPOWER)       += hid-lcpower.o
-obj-$(CONFIG_HID_LENOVO_TPKBD) += hid-lenovo-tpkbd.o
+obj-$(CONFIG_HID_LENOVO)       += hid-lenovo.o
 obj-$(CONFIG_HID_LOGITECH)     += hid-logitech.o
 obj-$(CONFIG_HID_LOGITECH_DJ)  += hid-logitech-dj.o
 obj-$(CONFIG_HID_MAGICMOUSE)    += hid-magicmouse.o
@@ -116,7 +116,9 @@ obj-$(CONFIG_HID_UCLOGIC)   += hid-uclogic.o
 obj-$(CONFIG_HID_XINMO)                += hid-xinmo.o
 obj-$(CONFIG_HID_ZEROPLUS)     += hid-zpff.o
 obj-$(CONFIG_HID_ZYDACRON)     += hid-zydacron.o
-obj-$(CONFIG_HID_WACOM)                += hid-wacom.o
+
+wacom-objs                     := wacom_wac.o wacom_sys.o
+obj-$(CONFIG_HID_WACOM)                += wacom.o
 obj-$(CONFIG_HID_WALTOP)       += hid-waltop.o
 obj-$(CONFIG_HID_WIIMOTE)      += hid-wiimote.o
 obj-$(CONFIG_HID_SENSOR_HUB)   += hid-sensor-hub.o