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: (21 commits)
  USB HID: don't warn on idVendor == 0
  USB HID: add 'quirks' module parameter
  USB HID: add support for dynamically-created quirks
  USB HID: clarify static quirk handling as squirks
  USB HID: encapsulate quirk handling into hid-quirks.c
  USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
  HID: update copyright and authorship macro
  HID: introduce proper zeroing of unused bits in output reports
  USB HID: add support for WiseGroup MP-8800 Quad Joypad
  USB HID: add FF support for Logitech Force 3D Pro Joystick
  USB HID: numlock quirk for dell W7658 keyboard
  USB HID: Logitech MX3000 keyboard needs report descriptor quirk
  USB HID: extend quirk for Logitech S510 keyboard
  USB HID: usbkbd/usbmouse - handle errors when registering devices
  USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
  HID: enable dead keys on a belkin wireless keyboard
  USB HID: Thustmaster firestorm dual power v1 support
  USB HID: specify explicit size for hid_blacklist.quirks
  USB HID: fix retry & reset logic
  USB HID: consolidate vendor/product ids
  ...

1 files changed, 35 insertions, 0 deletions

diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
new file mode 100644
index 000000000000..8e6ab5b164a2
--- /dev/null
+++ b/drivers/hid/usbhid/Makefile
@@ -0,0 +1,35 @@
+#
+# Makefile for the USB input drivers
+#
+
+# Multipart objects.
+usbhid-objs     := hid-core.o hid-quirks.o
+
+# Optional parts of multipart objects.
+
+ifeq ($(CONFIG_USB_HIDDEV),y)
+        usbhid-objs     += hiddev.o
+endif
+ifeq ($(CONFIG_HID_PID),y)
+        usbhid-objs     += hid-pidff.o
+endif
+ifeq ($(CONFIG_LOGITECH_FF),y)
+        usbhid-objs     += hid-lgff.o
+endif
+ifeq ($(CONFIG_PANTHERLORD_FF),y)
+        usbhid-objs     += hid-plff.o
+endif
+ifeq ($(CONFIG_THRUSTMASTER_FF),y)
+        usbhid-objs     += hid-tmff.o
+endif
+ifeq ($(CONFIG_ZEROPLUS_FF),y)
+        usbhid-objs     += hid-zpff.o
+endif
+ifeq ($(CONFIG_HID_FF),y)
+        usbhid-objs     += hid-ff.o
+endif
+
+obj-$(CONFIG_USB_HID)           += usbhid.o
+obj-$(CONFIG_USB_KBD)           += usbkbd.o
+obj-$(CONFIG_USB_MOUSE)         += usbmouse.o
+