mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-13 08:39:52 +00:00
HID: fix default building of HID-quirk drivers
Commit 9be7bbd54df3c9c393ccd19acc49f90c517d1291 (HID: build drivers for all quirky devices by default) made a wrong assumption about select/depends interaction in Kconfig, resulting in possibility of link failure with certain configuration options. Fix this by explicitly having all the quirk-drivers depend on USB_HID, default to y and make the possibility to alter the settings dependent on EBMEDDED. Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
278429cff8
commit
b36299bcc0
@ -17,25 +17,6 @@ config HID
|
|||||||
tristate "Generic HID support"
|
tristate "Generic HID support"
|
||||||
depends on INPUT
|
depends on INPUT
|
||||||
default y
|
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---
|
---help---
|
||||||
A human interface device (HID) is a type of computer device that
|
A human interface device (HID) is a type of computer device that
|
||||||
interacts directly with and takes input from humans. The term "HID"
|
interacts directly with and takes input from humans. The term "HID"
|
||||||
@ -102,16 +83,16 @@ config HID_COMPAT
|
|||||||
If unsure, say Y.
|
If unsure, say Y.
|
||||||
|
|
||||||
config HID_A4TECH
|
config HID_A4TECH
|
||||||
tristate "A4 tech"
|
tristate "A4 tech" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for A4 tech X5 and WOP-35 / Trust 450L mice.
|
Support for A4 tech X5 and WOP-35 / Trust 450L mice.
|
||||||
|
|
||||||
config HID_APPLE
|
config HID_APPLE
|
||||||
tristate "Apple"
|
tristate "Apple" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on (USB_HID || BT_HIDP)
|
depends on (USB_HID || BT_HIDP)
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for some Apple devices which less or more break
|
Support for some Apple devices which less or more break
|
||||||
HID specification.
|
HID specification.
|
||||||
@ -123,65 +104,65 @@ config HID_APPLE
|
|||||||
If unsure, say M.
|
If unsure, say M.
|
||||||
|
|
||||||
config HID_BELKIN
|
config HID_BELKIN
|
||||||
tristate "Belkin"
|
tristate "Belkin" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Belkin Flip KVM and Wireless keyboard.
|
Support for Belkin Flip KVM and Wireless keyboard.
|
||||||
|
|
||||||
config HID_BRIGHT
|
config HID_BRIGHT
|
||||||
tristate "Bright"
|
tristate "Bright" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Bright ABNT-2 keyboard.
|
Support for Bright ABNT-2 keyboard.
|
||||||
|
|
||||||
config HID_CHERRY
|
config HID_CHERRY
|
||||||
tristate "Cherry"
|
tristate "Cherry" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Cherry Cymotion.
|
Support for Cherry Cymotion.
|
||||||
|
|
||||||
config HID_CHICONY
|
config HID_CHICONY
|
||||||
tristate "Chicony"
|
tristate "Chicony" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Chicony Tactical pad.
|
Support for Chicony Tactical pad.
|
||||||
|
|
||||||
config HID_CYPRESS
|
config HID_CYPRESS
|
||||||
tristate "Cypress"
|
tristate "Cypress" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Cypress mouse and barcodes.
|
Support for Cypress mouse and barcodes.
|
||||||
|
|
||||||
config HID_DELL
|
config HID_DELL
|
||||||
tristate "Dell"
|
tristate "Dell" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Dell W7658.
|
Support for Dell W7658.
|
||||||
|
|
||||||
config HID_EZKEY
|
config HID_EZKEY
|
||||||
tristate "Ezkey"
|
tristate "Ezkey" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Ezkey mouse and barcodes.
|
Support for Ezkey mouse and barcodes.
|
||||||
|
|
||||||
config HID_GYRATION
|
config HID_GYRATION
|
||||||
tristate "Gyration"
|
tristate "Gyration" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Gyration remote.
|
Support for Gyration remote.
|
||||||
|
|
||||||
config HID_LOGITECH
|
config HID_LOGITECH
|
||||||
tristate "Logitech"
|
tristate "Logitech" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for some Logitech devices which breaks less or more
|
Support for some Logitech devices which breaks less or more
|
||||||
HID specification.
|
HID specification.
|
||||||
@ -211,24 +192,24 @@ config LOGIRUMBLEPAD2_FF
|
|||||||
Rumblepad 2 devices.
|
Rumblepad 2 devices.
|
||||||
|
|
||||||
config HID_MICROSOFT
|
config HID_MICROSOFT
|
||||||
tristate "Microsoft"
|
tristate "Microsoft" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for some Microsoft devices which breaks less or more
|
Support for some Microsoft devices which breaks less or more
|
||||||
HID specification.
|
HID specification.
|
||||||
|
|
||||||
config HID_MONTEREY
|
config HID_MONTEREY
|
||||||
tristate "Monterey"
|
tristate "Monterey" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Monterey Genius KB29E.
|
Support for Monterey Genius KB29E.
|
||||||
|
|
||||||
config HID_PANTHERLORD
|
config HID_PANTHERLORD
|
||||||
tristate "Pantherlord devices support"
|
tristate "Pantherlord devices support" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for PantherLord/GreenAsia based device support.
|
Support for PantherLord/GreenAsia based device support.
|
||||||
|
|
||||||
@ -242,30 +223,30 @@ config PANTHERLORD_FF
|
|||||||
or adapter and want to enable force feedback support for it.
|
or adapter and want to enable force feedback support for it.
|
||||||
|
|
||||||
config HID_PETALYNX
|
config HID_PETALYNX
|
||||||
tristate "Petalynx"
|
tristate "Petalynx" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Petalynx Maxter remote.
|
Support for Petalynx Maxter remote.
|
||||||
|
|
||||||
config HID_SAMSUNG
|
config HID_SAMSUNG
|
||||||
tristate "Samsung"
|
tristate "Samsung" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Samsung IR remote.
|
Support for Samsung IR remote.
|
||||||
|
|
||||||
config HID_SONY
|
config HID_SONY
|
||||||
tristate "Sony"
|
tristate "Sony" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Sony PS3 controller.
|
Support for Sony PS3 controller.
|
||||||
|
|
||||||
config HID_SUNPLUS
|
config HID_SUNPLUS
|
||||||
tristate "Sunplus"
|
tristate "Sunplus" if EMBEDDED
|
||||||
default m
|
|
||||||
depends on USB_HID
|
depends on USB_HID
|
||||||
|
default y
|
||||||
---help---
|
---help---
|
||||||
Support for Sunplus WDesktop input device.
|
Support for Sunplus WDesktop input device.
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user