Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub...

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 329fbb9b59766f82af6c744e4e85a6ee1dc88208..f7220011a00b7cde8c16754743517ca17301366a 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -344,6 +344,7 @@ config HID_LOGITECH
 
 config HID_LOGITECH_DJ
        tristate "Logitech Unifying receivers full support"
+       depends on HIDRAW
        depends on HID_LOGITECH
        ---help---
        Say Y if you want support for Logitech Unifying receivers and devices.
@@ -460,6 +461,7 @@ config HID_MULTITOUCH
          - Stantum multitouch panels
          - Touch International Panels
          - Unitec Panels
+         - Wistron optical touch panels
          - XAT optical touch panels
          - Xiroku optical touch panels
          - Zytronic touch panels