diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
commit | 13ea3300100ec3461560b1e061033cd167333a86 (patch) | |
tree | c60a016a06c488adada6959516e2a2de96d6d7d3 /drivers/hid/Kconfig | |
parent | b7ed6b88b2a5e961eeb939ef637a3cbb435a23a7 (diff) | |
parent | 68e67d97e1f91ed11e041b67f3a1336f518c608f (diff) | |
download | linux-stable-13ea3300100ec3461560b1e061033cd167333a86.tar.gz linux-stable-13ea3300100ec3461560b1e061033cd167333a86.tar.bz2 linux-stable-13ea3300100ec3461560b1e061033cd167333a86.zip |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 329fbb9b5976..34e2d39d4ce8 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -460,6 +460,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 |