Commit 5489375d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: completely remove apple mightymouse from blacklist
  HID: support larger reports than 64 bytes in hiddev
  HID: local function should be static
  HID: ignore Philips IEEE802.15.4 RF Dongle
  HID: ignore all recent SoundGraph iMON devices
  HID: fix memory leak on error patch in debug code
  HID: fix overrun in quirks initialization
  HID: Drop NULL test on list_entry result
  HID: driver for Twinhan USB 6253:0100 remote control
  HID: adding __init/__exit macros to module init/exit functions
  HID: add rumble support for Thrustmaster Dual Trigger 3-in-1
  HID: ntrig tool separation and pen usages
  HID: Avoid double spin_lock_init on usbhid->lock
  HID: add force feedback support for Logitech WingMan Formula Force GP
  HID: Support new variants of Samsung USB IR receiver (0419:0001)
  HID: fix memory leak on error path in debug code
  HID: fix debugfs build with !CONFIG_DEBUG_FS
  HID: use debugfs for events/reports dumping
  HID: use debugfs for report dumping descriptor
parents 355bbd8c 8123e8f7

drivers/hid/Kconfig

+11 −18
Original line number Diff line number Diff line
@@ -31,21 +31,6 @@ config HID 


	  If unsure, say Y.



config HID_DEBUG

	bool "HID debugging support"

	default y

	depends on HID

	---help---

	This option lets the HID layer output diagnostics about its internal

	state, resolve HID usages, dump HID fields, etc. Individual HID drivers

	use this debugging facility to output information about individual HID

	devices, etc.



	This feature is useful for those who are either debugging the HID parser

	or any HID hardware device.



	If unsure, say Y.



config HIDRAW

	bool "/dev/hidraw raw HID device support"

	depends on HID
@@ -152,6 +137,13 @@ config HID_GYRATION 
	---help---

	Support for Gyration remote control.



config HID_TWINHAN

	tristate "Twinhan" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Twinhan IR remote control.



config HID_KENSINGTON

	tristate "Kensington" if EMBEDDED

	depends on USB_HID
@@ -176,6 +168,7 @@ config LOGITECH_FF 
	  - Logitech WingMan Cordless RumblePad 2

	  - Logitech WingMan Force 3D

	  - Logitech Formula Force EX

	  - Logitech WingMan Formula Force GP

	  - Logitech MOMO Force wheel



	  and if you want to enable force feedback for them.
@@ -314,9 +307,9 @@ config THRUSTMASTER_FF 
	depends on HID_THRUSTMASTER

	select INPUT_FF_MEMLESS

	---help---

	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or

	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel and

	  want to enable force feedback support for it.

	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or 3,

	  a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT

	  Rumble Force or Force Feedback Wheel.



config HID_WACOM

	tristate "Wacom Bluetooth devices support" if EMBEDDED

drivers/hid/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -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

drivers/hid/hid-a4tech.c

+2 −2
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ static struct hid_driver a4_driver = { 
	.remove = a4_remove,

};



static int a4_init(void)

static int __init a4_init(void)

{

	return hid_register_driver(&a4_driver);

}



static void a4_exit(void)

static void __exit a4_exit(void)

{

	hid_unregister_driver(&a4_driver);

}

drivers/hid/hid-apple.c

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static struct hid_driver apple_driver = { 
	.input_mapped = apple_input_mapped,

};



static int apple_init(void)

static int __init apple_init(void)

{

	int ret;
@@ -462,7 +462,7 @@ static int apple_init(void) 
	return ret;

}



static void apple_exit(void)

static void __exit apple_exit(void)

{

	hid_unregister_driver(&apple_driver);

}

drivers/hid/hid-belkin.c

+2 −2
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ static struct hid_driver belkin_driver = { 
	.probe = belkin_probe,

};



static int belkin_init(void)

static int __init belkin_init(void)

{

	return hid_register_driver(&belkin_driver);

}



static void belkin_exit(void)

static void __exit belkin_exit(void)

{

	hid_unregister_driver(&belkin_driver);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE