diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 09:17:48 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 09:17:48 -0800 |
| commit | 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch) | |
| tree | c076d2f0b5d4ae8726a50206042d3e3a41620fe4 /drivers/hid/Kconfig | |
| parent | 56a8bd6dcf81693e61a712097216904f3a4ab536 (diff) | |
| parent | 69479f8da68f1930b2078b2ebf6533fb00339918 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Conflicts:
drivers/input/Makefile
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 3052e2969ad..401acecc7f3 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -154,7 +154,8 @@ config HID_EGALAX tristate "eGalax multi-touch panel" depends on USB_HID ---help--- - Support for the eGalax dual-touch panel. + Support for the eGalax dual-touch panels, including the + Joojoo and Wetab tablets. config HID_ELECOM tristate "ELECOM BM084 bluetooth mouse" |