summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-07-20 19:08:17 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-07-20 19:08:17 +0200
commitc57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch)
treeece13738a44545fb110e5d73adbf2625bc7a1ea6 /drivers/input/touchscreen/Kconfig
parentInput: elan_i2c - enable ELAN0600 acpi panels (diff)
parentLinux 4.2-rc3 (diff)
downloadlinux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.xz
linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
-rw-r--r--drivers/input/touchscreen/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 27035ecbd4f5..5b272ba091ab 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -992,8 +992,9 @@ config TOUCHSCREEN_SUN4I
config TOUCHSCREEN_SUR40
tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
- depends on USB
+ depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
select INPUT_POLLDEV
+ select VIDEOBUF2_DMA_SG
help
Say Y here if you want support for the Samsung SUR40 touchscreen
(also known as Microsoft Surface 2.0 or Microsoft PixelSense).