Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8e07fe8505fd..a23a94bb4bcb 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -555,18 +555,6 @@ config TOUCHSCREEN_TI_AM335X_TSC
           To compile this driver as a module, choose M here: the
           module will be called ti_am335x_tsc.
 
-config TOUCHSCREEN_ATMEL_TSADCC
-        tristate "Atmel Touchscreen Interface"
-        depends on ARCH_AT91
-        help
-          Say Y here if you have a 4-wire touchscreen connected to the
-          ADC Controller on your Atmel SoC.
-
-          If unsure, say N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called atmel_tsadcc.
-
 config TOUCHSCREEN_UCB1400
         tristate "Philips UCB1400 touchscreen"
         depends on AC97_BUS
@@ -645,7 +633,7 @@ config TOUCHSCREEN_WM9713
 
 config TOUCHSCREEN_WM97XX_ATMEL
         tristate "WM97xx Atmel accelerated touch"
-        depends on TOUCHSCREEN_WM97XX && (AVR32 || ARCH_AT91)
+        depends on TOUCHSCREEN_WM97XX && AVR32
         help
           Say Y here for support for streaming mode with WM97xx touchscreens
           on Atmel AT91 or AVR32 systems with an AC97C module.