Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / drivers / hid / Makefile

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