diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
commit | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch) | |
tree | 326d5f84b13938a12fb27468ef73db4faf43a44e /drivers/hid/Kconfig | |
parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
parent | 8c8b01c38a70661d663175d355fdea85ca082272 (diff) | |
download | kernel_samsung_crespo-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.zip kernel_samsung_crespo-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.gz kernel_samsung_crespo-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.bz2 |
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 4340993..d51f014 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 |