Merge tag 'v4.2-rc3' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index a854c6e5f09eca6d01515ae09065eaa31bc364e8..5b272ba091aba760a4d91a441bc4474bb02ace0d 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -11,9 +11,9 @@ menuconfig INPUT_TOUCHSCREEN
 
 if INPUT_TOUCHSCREEN
 
-config OF_TOUCHSCREEN
+config TOUCHSCREEN_PROPERTIES
        def_tristate INPUT
-       depends on INPUT && OF
+       depends on INPUT
 
 config TOUCHSCREEN_88PM860X
        tristate "Marvell 88PM860x touchscreen"