Merge branch 'next' into for-linus

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

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index eb031b7a486632bd698d359bb3fb07dbdaaaa044..b080f0cfb068f0ad3912a72048cd84836ab76182 100644 (file)
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -42,6 +42,16 @@ config JOYSTICK_A3D
          To compile this driver as a module, choose M here: the
          module will be called a3d.
 
+config JOYSTICK_ADC
+       tristate "Simple joystick connected over ADC"
+       depends on IIO
+       select IIO_BUFFER_CB
+       help
+         Say Y here if you have a simple joystick connected over ADC.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adc-joystick.
+
 config JOYSTICK_ADI
        tristate "Logitech ADI digital joysticks and gamepads"
        select GAMEPORT