Merge tag 'v4.2-rc3' into next

[deliverable/linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 27035ecbd4f5c892c6a7bb77a1b6bb966a0c04a7..5b272ba091aba760a4d91a441bc4474bb02ace0d 100644 (file)
--- 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).