summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorPrzemo Firszt2012-03-22 19:54:05 +0100
committerJiri Kosina2012-03-28 10:22:56 +0200
commit224b321b312e9c03989e1563beaa50f98f9b48e0 (patch)
tree556274ddcb84117bb4cb31b6e7e8cbab6ee4f665 /drivers/hid/Kconfig
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
downloadkernel-qcow2-linux-224b321b312e9c03989e1563beaa50f98f9b48e0.tar.gz
kernel-qcow2-linux-224b321b312e9c03989e1563beaa50f98f9b48e0.tar.xz
kernel-qcow2-linux-224b321b312e9c03989e1563beaa50f98f9b48e0.zip
HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY option
This option was ment as a safety mechanism in case the system treats the wacom tablet battery as the main power supply. It's no longer required as now we can distinguish between system power supply and device power supply. Signed-off-by: Przemo Firszt <przemo@firszt.eu> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a3d033252995..c2ab80e5f62a 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -595,16 +595,10 @@ config THRUSTMASTER_FF
config HID_WACOM
tristate "Wacom Bluetooth devices support"
depends on BT_HIDP
- ---help---
- Support for Wacom Graphire Bluetooth tablet.
-
-config HID_WACOM_POWER_SUPPLY
- bool "Wacom Bluetooth devices power supply status support"
depends on HID_WACOM
select POWER_SUPPLY
---help---
- Say Y here if you want to enable power supply status monitoring for
- Wacom Bluetooth devices.
+ Support for Wacom Graphire Bluetooth tablet.
config HID_WIIMOTE
tristate "Nintendo Wii Remote support"