Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f45471cb authored May 26, 2010 by Linus Torvalds

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: roccat: fix build failure if built as module
  HID: roccat: propagate special events of roccat hardware to userspace
  HID: Add the GYR4101US USB ID to hid-gyration
  HID: fix hid-roccat-kone for bin_attr API change

parents 2214482c 0e927bfc

drivers/hid/Kconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -347,6 +347,14 @@ config HID_QUANTA
	---help---		---help---
	Support for Quanta Optical Touch dual-touch panels.		Support for Quanta Optical Touch dual-touch panels.

			config HID_ROCCAT
			tristate "Roccat special event support"
			depends on USB_HID
			---help---
			Support for Roccat special events.
			Say Y here if you have a Roccat mouse or keyboard and want OSD or
			macro execution support.

	config HID_ROCCAT_KONE		config HID_ROCCAT_KONE
	tristate "Roccat Kone Mouse support"		tristate "Roccat Kone Mouse support"
	depends on USB_HID		depends on USB_HID

drivers/hid/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
	obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o		obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
	obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o		obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
	obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o		obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o
			obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o
	obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o		obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
	obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o		obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
	obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o		obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o

drivers/hid/hid-core.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1301,6 +1301,7 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },		{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

drivers/hid/hid-gyration.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ static int gyration_event(struct hid_device hdev, struct hid_field field,
	static const struct hid_device_id gyration_devices[] = {		static const struct hid_device_id gyration_devices[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
	{ }		{ }
	};		};
	MODULE_DEVICE_TABLE(hid, gyration_devices);		MODULE_DEVICE_TABLE(hid, gyration_devices);

drivers/hid/hid-ids.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -282,6 +282,7 @@
	#define USB_VENDOR_ID_GYRATION 0x0c16		#define USB_VENDOR_ID_GYRATION 0x0c16
	#define USB_DEVICE_ID_GYRATION_REMOTE 0x0002		#define USB_DEVICE_ID_GYRATION_REMOTE 0x0002
	#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003		#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
			#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008

	#define USB_VENDOR_ID_HAPP 0x078b		#define USB_VENDOR_ID_HAPP 0x078b
	#define USB_DEVICE_ID_UGCI_DRIVING 0x0010		#define USB_DEVICE_ID_UGCI_DRIVING 0x0010