diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:27:54 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:27:54 +0400 |
| commit | 9929ffed889b4861b52ba648a44fa4add945c4d1 (patch) | |
| tree | 3cca02ae6b6616cc9a204b762aab349fcfa3aefe /drivers/hid/Kconfig | |
| parent | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (diff) | |
| parent | d5e0a06f17a0ffb0eb08a5bd7b18f00af70d9a12 (diff) | |
| download | linux-9929ffed889b4861b52ba648a44fa4add945c4d1.tar.xz | |
Merge branch 'upstream-fixes' into for-linus
Conflicts:
drivers/hid/hid-ids.h
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 d51f0144a3b9..f54050c2e38d 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -423,10 +423,11 @@ config SMARTJOYPLUS_FF enable force feedback support for it. config HID_TOPSEED - tristate "TopSeed Cyberlink remote control support" + tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support" depends on USB_HID ---help--- - Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control. + Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic + CLLRCMCE remote control. config HID_THRUSTMASTER tristate "ThrustMaster devices support" |