Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus

[net-next-2.6.git] / drivers / hid / Makefile

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 9b9271d6527a64d5b0f1d2ad43c4b38f8453948c..0de2dff5542c9c59255f546fa8b2b512d9312c9e 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -3,9 +3,12 @@
 #
 hid-objs                       := hid-core.o hid-input.o
 
+ifdef CONFIG_DEBUG_FS
+       hid-objs                += hid-debug.o
+endif
+
 obj-$(CONFIG_HID)              += hid.o
 
-hid-$(CONFIG_HID_DEBUG)                += hid-debug.o
 hid-$(CONFIG_HIDRAW)           += hidraw.o
 
 hid-logitech-objs              := hid-lg.o