Merge remote-tracking branch 'input/next'

diff --combined drivers/input/touchscreen/Kconfig
index 66c62641b59a31cfb7622dd5be14729b62176dc9,f4e53b4a6062b3b8319299b9ea5c48988217b626..fba4d5665857221bf657db7bff1c5578fc48e4be
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -334,7 -334,7 +334,7 @@@ config TOUCHSCREEN_FUJITS
  config TOUCHSCREEN_GOODIX
        tristate "Goodix I2C touchscreen"
        depends on I2C
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          Say Y here if you have the Goodix touchscreen (such as one
          installed in Onda v975w tablets) connected to your
@@@ -376,7 -376,7 +376,7 @@@ config TOUCHSCREEN_IPRO
  config TOUCHSCREEN_S3C2410
        tristate "Samsung S3C2410/generic touchscreen input driver"
        depends on ARCH_S3C24XX || SAMSUNG_DEV_TS
 -      select S3C_ADC
 +      depends on S3C_ADC
        help
          Say Y here if you have the s3c2410 touchscreen.
  
@@@ -1112,7 -1112,8 +1112,8 @@@ config TOUCHSCREEN_ZFORC
  
  config TOUCHSCREEN_COLIBRI_VF50
        tristate "Toradex Colibri on board touchscreen driver"
-       depends on GPIOLIB && IIO && VF610_ADC
+       depends on IIO && VF610_ADC
+       depends on GPIOLIB || COMPILE_TEST
        help
          Say Y here if you have a Colibri VF50 and plan to use
          the on-board provided 4-wire touchscreen driver.