Merge tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[uclinux-h8/linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 80f6386..d20fe1d 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -958,6 +958,7 @@ config TOUCHSCREEN_ST1232
 config TOUCHSCREEN_STMPE
        tristate "STMicroelectronics STMPE touchscreens"
        depends on MFD_STMPE
+       depends on (OF || COMPILE_TEST)
        help
          Say Y here if you want support for STMicroelectronics
          STMPE touchscreen controllers.
@@ -979,8 +980,7 @@ config TOUCHSCREEN_SUN4I
 
 config TOUCHSCREEN_SUR40
        tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
-       depends on USB
-       depends on MEDIA_USB_SUPPORT
+       depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
        select INPUT_POLLDEV
        select VIDEOBUF2_DMA_SG
        help