diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:10:38 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:10:38 +0100 |
| commit | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 (patch) | |
| tree | 718281e0f03caaf45c3928fab322e60f7631a9bb /drivers/hid/Kconfig | |
| parent | b50b9d3d21e0af1b8bda94d43c569593d45587af (diff) | |
| parent | 7da85fbf1c87d4f73621e0e7666a3387497075a9 (diff) | |
| download | talos-op-linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.gz talos-op-linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.zip | |
Merge branch 'for-4.15/upstream' into for-linus
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 374301fcbc86..779c5ae47f36 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -230,7 +230,7 @@ config HID_CMEDIA config HID_CP2112 tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support" - depends on USB_HID && I2C && GPIOLIB + depends on USB_HID && HIDRAW && I2C && GPIOLIB select GPIOLIB_IRQCHIP ---help--- Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge. @@ -750,11 +750,10 @@ config HID_PRIMAX HID standard. config HID_RETRODE - tristate "Retrode" + tristate "Retrode 2 USB adapter for vintage video games" depends on USB_HID ---help--- Support for - * Retrode 2 cartridge and controller adapter config HID_ROCCAT |
