Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 38a226f9fcbd42b874a2d1e9d37dc28fae4b0192..4f15496fec8b56ebaa75dd22051b0ce63d9a6827 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -795,21 +795,6 @@ config TOUCHSCREEN_WM9713
          Say Y here to enable support for the Wolfson Microelectronics
          WM9713 touchscreen controller.
 
-config TOUCHSCREEN_WM97XX_ATMEL
-       tristate "WM97xx Atmel accelerated touch"
-       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.
-
-         Be aware that this will use channel B in the controller for
-         streaming data, this must not conflict with other AC97C drivers.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the module will
-         be called atmel-wm97xx.
-
 config TOUCHSCREEN_WM97XX_MAINSTONE
        tristate "WM97xx Mainstone/Palm accelerated touch"
        depends on TOUCHSCREEN_WM97XX && ARCH_PXA