diff options
author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-03-18 09:27:53 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-03-21 12:05:02 -0400 |
commit | 043b403aede4a528ed99ceaf050f567f1283a23e (patch) | |
tree | c3d67092fcba29716fdd7481968d8f9449127f35 /drivers/hid/Kconfig | |
parent | 9498f954a4ec389806333041a1018909c6fe0518 (diff) |
HID: hid-multitouch: migrate support for Stantum panels to the unified driver.
This patch merges hid-stantum to the generic multitouch driver.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Stéphane Chatty <chatty@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index b7ec4057841d..3c72f16e725f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -327,6 +327,7 @@ config HID_MULTITOUCH | |||
327 | - 'Sensing Win7-TwoFinger' panel by GeneralTouch | 327 | - 'Sensing Win7-TwoFinger' panel by GeneralTouch |
328 | - eGalax dual-touch panels, including the | 328 | - eGalax dual-touch panels, including the |
329 | Joojoo and Wetab tablets | 329 | Joojoo and Wetab tablets |
330 | - Stantum multitouch panels | ||
330 | 331 | ||
331 | If unsure, say N. | 332 | If unsure, say N. |
332 | 333 | ||
@@ -493,12 +494,6 @@ config HID_SONY | |||
493 | ---help--- | 494 | ---help--- |
494 | Support for Sony PS3 controller. | 495 | Support for Sony PS3 controller. |
495 | 496 | ||
496 | config HID_STANTUM | ||
497 | tristate "Stantum multitouch panel" | ||
498 | depends on USB_HID | ||
499 | ---help--- | ||
500 | Support for Stantum multitouch panel. | ||
501 | |||
502 | config HID_SUNPLUS | 497 | config HID_SUNPLUS |
503 | tristate "Sunplus wireless desktop" | 498 | tristate "Sunplus wireless desktop" |
504 | depends on USB_HID | 499 | depends on USB_HID |