diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:56:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:56:37 -0800 |
| commit | 2ac04a1597d9bca952dafcf8cbff4621884cb723 (patch) | |
| tree | a6e20ab900dfc425a6b9c6bef9939383113d3072 /drivers/hid/Makefile | |
| parent | 0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2 (diff) | |
| parent | a417a21e10831bca695b4ba9c74f4ddf5a95ac06 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
USB HID: handle multi-interface devices for Apple macbook pro properly
HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG
USB HID: fix bogus comment in hid_get_class_descriptor()
USB HID: remove hid_find_field_by_usage()
HID: API - fix leftovers of hidinput API in USB HID
HID: hid debug from hid-debug.h to hid layer
hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter
hid: quirk for multi-input devices with unneeded output reports
hid: allow force feedback for multi-input devices
Diffstat (limited to 'drivers/hid/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 6432392110b..52e97d8f3c9 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -1,15 +1,8 @@ # # 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 |