diff options
| author | Jiri Kosina | 2010-08-04 15:26:15 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2010-08-04 15:26:15 +0200 |
| commit | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch) | |
| tree | 326d5f84b13938a12fb27468ef73db4faf43a44e /drivers/hid/Kconfig | |
| parent | Linux 2.6.35-rc5 (diff) | |
| parent | HID: ignore digitizer usage Undefined (0x00) (diff) | |
| download | kernel-qcow2-linux-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.gz kernel-qcow2-linux-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.xz kernel-qcow2-linux-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 434099369058..d51f0144a3b9 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -148,6 +148,12 @@ config HID_EGALAX ---help--- Support for the eGalax dual-touch panel. +config HID_ELECOM + tristate "ELECOM" + depends on BT_HIDP + ---help--- + Support for the ELECOM BM084 (bluetooth mouse). + config HID_EZKEY tristate "Ezkey" if EMBEDDED depends on USB_HID |