Merge branch 'fix/hda' into for-linus

[~andy/linux] / drivers / hid / Makefile

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index db35151673b17f25f453bb7cf2b7018eb580b4dd..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
@@ -40,6 +43,7 @@ obj-$(CONFIG_HID_SUNPLUS)     += hid-sunplus.o
 obj-$(CONFIG_HID_GREENASIA)    += hid-gaff.o
 obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
 obj-$(CONFIG_HID_TOPSEED)      += hid-topseed.o
+obj-$(CONFIG_HID_TWINHAN)      += hid-twinhan.o
 obj-$(CONFIG_HID_ZEROPLUS)     += hid-zpff.o
 obj-$(CONFIG_HID_WACOM)                += hid-wacom.o