Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic...

[firefly-linux-kernel-4.4.55.git] / drivers / hid / usbhid / Makefile

diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index db3cf31c6fa133fb1356f1f4648291a4ea4b46a0..890f2914a8ff90a2b4c946b2d22ee8748e7855dc 100644 (file)
--- a/drivers/hid/usbhid/Makefile
+++ b/drivers/hid/usbhid/Makefile
@@ -2,17 +2,9 @@
 # Makefile for the USB input drivers
 #
 
-# Multipart objects.
 usbhid-y       := hid-core.o hid-quirks.o
-
-# Optional parts of multipart objects.
-
-ifeq ($(CONFIG_USB_HIDDEV),y)
-       usbhid-y        += hiddev.o
-endif
-ifeq ($(CONFIG_HID_PID),y)
-       usbhid-y        += hid-pidff.o
-endif
+usbhid-$(CONFIG_USB_HIDDEV)    += hiddev.o
+usbhid-$(CONFIG_HID_PID)       += hid-pidff.o
 
 obj-$(CONFIG_USB_HID)          += usbhid.o
 obj-$(CONFIG_USB_KBD)          += usbkbd.o