diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
commit | f1275410a108ac38b59149d10bce3f35edd70876 (patch) | |
tree | e86e0bab91fd1c2faa678b2c2c8442019bf4f92a /drivers/hid/Kconfig | |
parent | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (diff) | |
parent | 00e7f9649b3061281fe4b463263da26155dc9be4 (diff) |
Merge branch 'waltop' into for-linus
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 2685beebc8dc..3052e2969ad0 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -182,6 +182,12 @@ config HID_UCLOGIC | |||
182 | ---help--- | 182 | ---help--- |
183 | Support for UC-Logic tablets. | 183 | Support for UC-Logic tablets. |
184 | 184 | ||
185 | config HID_WALTOP | ||
186 | tristate "Waltop" | ||
187 | depends on USB_HID | ||
188 | ---help--- | ||
189 | Support for Waltop tablets. | ||
190 | |||
185 | config HID_GYRATION | 191 | config HID_GYRATION |
186 | tristate "Gyration remote control" | 192 | tristate "Gyration remote control" |
187 | depends on USB_HID | 193 | depends on USB_HID |