[PATCH] Generic HID layer - build

[mirror_ubuntu-zesty-kernel.git] / drivers / usb / input / Makefile

diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 48551be324ac61fb102a530fcd34ad0205fbed57..1a24b5bfa05fcd493adecc2822e3aab0fe862c62 100644 (file)
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Multipart objects.
-wacom-objs     := wacom_sys.o wacom_wac.o
+wacom-objs     := wacom_wac.o wacom_sys.o
 usbhid-objs    := hid-core.o
 
 # Optional parts of multipart objects.
@@ -11,11 +11,8 @@ usbhid-objs  := hid-core.o
 ifeq ($(CONFIG_USB_HIDDEV),y)
        usbhid-objs     += hiddev.o
 endif
-ifeq ($(CONFIG_USB_HIDINPUT),y)
-       usbhid-objs     += hid-input.o
-endif
 ifeq ($(CONFIG_HID_PID),y)
-       usbhid-objs     += pid.o
+       usbhid-objs     += hid-pidff.o
 endif
 ifeq ($(CONFIG_LOGITECH_FF),y)
        usbhid-objs     += hid-lgff.o
@@ -23,6 +20,9 @@ endif
 ifeq ($(CONFIG_THRUSTMASTER_FF),y)
        usbhid-objs     += hid-tmff.o
 endif
+ifeq ($(CONFIG_ZEROPLUS_FF),y)
+       usbhid-objs     += hid-zpff.o
+endif
 ifeq ($(CONFIG_HID_FF),y)
        usbhid-objs     += hid-ff.o
 endif
@@ -45,7 +45,6 @@ obj-$(CONFIG_USB_ACECAD)      += acecad.o
 obj-$(CONFIG_USB_YEALINK)      += yealink.o
 obj-$(CONFIG_USB_XPAD)         += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)   += appletouch.o
-obj-$(CONFIG_USB_TRANCEVIBRATOR)       += trancevibrator.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG