diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-09-01 21:56:46 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-09-01 21:56:46 +0200 |
| commit | e4ee5090e3e5e9c2f38aa761436fc494e3a80937 (patch) | |
| tree | 0891e6dadf512820ba0f04593d065d94e9c7c39a /drivers/hid/Kconfig | |
| parent | 56e527b0f790dd8e7f077b9197eba11f2117a527 (diff) | |
| parent | bebf8820b355e6ac00487f3f36440d502eb4a44c (diff) | |
| download | linux-e4ee5090e3e5e9c2f38aa761436fc494e3a80937.tar.gz | |
Merge branch 'for-5.15/cmedia' into for-linus
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 76937f716fbe..33d28faddbc0 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -259,10 +259,11 @@ config HID_PRODIKEYS and some additional multimedia keys. config HID_CMEDIA - tristate "CMedia CM6533 HID audio jack controls" + tristate "CMedia audio chips" depends on HID help - Support for CMedia CM6533 HID audio jack controls. + Support for CMedia CM6533 HID audio jack controls + and HS100B mute buttons. config HID_CP2112 tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support" |