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

Commit 65ae24b1 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: blacklist additional SoundGraph iMon LCD models
  HID: fix/improve help texts for quirk drivers
  HID: fix default building of HID-quirk drivers
parents cb23832e 24c88eb6

drivers/hid/Kconfig

+49 −73
Original line number Diff line number Diff line
@@ -17,25 +17,6 @@ config HID 
	tristate "Generic HID support"

	depends on INPUT

	default y

        select HID_A4TECH if !EMBEDDED

        select HID_APPLE if !EMBEDDED

        select HID_BELKIN if !EMBEDDED

        select HID_BRIGHT if !EMBEDDED

        select HID_CHERRY if !EMBEDDED

        select HID_CHICONY if !EMBEDDED

        select HID_CYPRESS if !EMBEDDED

        select HID_DELL if !EMBEDDED

        select HID_EZKEY if !EMBEDDED

        select HID_GYRATION if !EMBEDDED

        select HID_LOGITECH if !EMBEDDED

        select HID_MICROSOFT if !EMBEDDED

        select HID_MONTEREY if !EMBEDDED

        select HID_PANTHERLORD if !EMBEDDED

        select HID_PETALYNX if !EMBEDDED

        select HID_SAMSUNG if !EMBEDDED

        select HID_SONY if !EMBEDDED

        select HID_SUNPLUS if !EMBEDDED



	---help---

	  A human interface device (HID) is a type of computer device that

	  interacts directly with and takes input from humans. The term "HID"
@@ -102,89 +83,86 @@ config HID_COMPAT 
	If unsure, say Y.



config HID_A4TECH

	tristate "A4 tech"

	default m

	tristate "A4 tech" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for A4 tech X5 and WOP-35 / Trust 450L mice.



config HID_APPLE

	tristate "Apple"

	default m

	tristate "Apple" if EMBEDDED

	depends on (USB_HID || BT_HIDP)

	default y

	---help---

	Support for some Apple devices which less or more break

	HID specification.



	Say Y here if you want support for the special keys (Fn, Numlock) on

	Apple iBooks, PowerBooks, MacBooks, MacBook Pros and aluminum USB

	keyboards.



	If unsure, say M.

	Say Y here if you want support for keyboards of	Apple iBooks, PowerBooks,

	MacBooks, MacBook Pros and Apple Aluminum.



config HID_BELKIN

	tristate "Belkin"

	default m

	tristate "Belkin" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Belkin Flip KVM and Wireless keyboard.



config HID_BRIGHT

	tristate "Bright"

	default m

	tristate "Bright" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Bright ABNT-2 keyboard.



config HID_CHERRY

	tristate "Cherry"

	default m

	tristate "Cherry" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Cherry Cymotion.

	Support for Cherry Cymotion keyboard.



config HID_CHICONY

	tristate "Chicony"

	default m

	tristate "Chicony" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Chicony Tactical pad.



config HID_CYPRESS

	tristate "Cypress"

	default m

	tristate "Cypress" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Cypress mouse and barcodes.

	Support for cypress mouse and barcode readers.



config HID_DELL

	tristate "Dell"

	default m

	tristate "Dell" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Dell W7658.

	Support for quirky Dell HID hardware that require

	special LED handling (W7658 and SK8115 models)



config HID_EZKEY

	tristate "Ezkey"

	default m

	tristate "Ezkey" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Ezkey mouse and barcodes.

	Support for Ezkey BTC 8193 keyboard.



config HID_GYRATION

	tristate "Gyration"

	default m

	tristate "Gyration" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Gyration remote.

	Support for Gyration remote control.



config HID_LOGITECH

	tristate "Logitech"

	default m

	tristate "Logitech" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for some Logitech devices which breaks less or more

	HID specification.

	Support for Logitech devices that are not fully compliant with HID standard.



config LOGITECH_FF

	bool "Logitech force feedback"
@@ -211,28 +189,26 @@ config LOGIRUMBLEPAD2_FF 
	  Rumblepad 2 devices.



config HID_MICROSOFT

	tristate "Microsoft"

	default m

	tristate "Microsoft" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for some Microsoft devices which breaks less or more

	HID specification.

	Support for Microsoft devices that are not fully compliant with HID standard.



config HID_MONTEREY

	tristate "Monterey"

	default m

	tristate "Monterey" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Monterey Genius KB29E.



config HID_PANTHERLORD

	tristate "Pantherlord devices support"

	default m

	tristate "Pantherlord devices support" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for PantherLord/GreenAsia based device support.





config PANTHERLORD_FF

	bool "Pantherlord force feedback support"

	depends on HID_PANTHERLORD
@@ -242,32 +218,32 @@ config PANTHERLORD_FF 
	  or adapter and want to enable force feedback support for it.



config HID_PETALYNX

	tristate "Petalynx"

	default m

	tristate "Petalynx" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Petalynx Maxter remote.

	Support for Petalynx Maxter remote control.



config HID_SAMSUNG

	tristate "Samsung"

	default m

	tristate "Samsung" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Samsung IR remote.

	Support for Samsung InfraRed remote control.



config HID_SONY

	tristate "Sony"

	default m

	tristate "Sony" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Sony PS3 controller.



config HID_SUNPLUS

	tristate "Sunplus"

	default m

	tristate "Sunplus" if EMBEDDED

	depends on USB_HID

	default y

	---help---

	Support for Sunplus WDesktop input device.

	Support for Sunplus wireless desktop.



config THRUSTMASTER_FF

	tristate "ThrustMaster devices support"

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,8 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ 


#define USB_VENDOR_ID_SOUNDGRAPH	0x15c2

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034



#define USB_VENDOR_ID_SUN		0x0430

#define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab