Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / drivers / hid / Makefile

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 6432392110bfee17d5a1acaadb41efa0f79b8db0..1ac5103f7c93b151e47aca38a5431ce16234b8dc 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -1,15 +1,14 @@
 #
 # Makefile for the HID driver
 #
-
-# Multipart objects.
-hid-objs       := hid-core.o hid-input.o
-
-# Optional parts of multipart objects.
+hid-objs                       := hid-core.o hid-input.o
 
 obj-$(CONFIG_HID)              += hid.o
 
-ifeq ($(CONFIG_INPUT_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+hid-$(CONFIG_HID_DEBUG)                += hid-debug.o
+hid-$(CONFIG_HIDRAW)           += hidraw.o
+
+obj-$(CONFIG_USB_HID)          += usbhid/
+obj-$(CONFIG_USB_MOUSE)                += usbhid/
+obj-$(CONFIG_USB_KBD)          += usbhid/