Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / iio / resolver / Kconfig

diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
index a4a3634..6ecd79e 100644 (file)
--- a/drivers/staging/iio/resolver/Kconfig
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -25,30 +25,3 @@ config AD2S1210
          Say yes here to build support for Analog Devices spi resolver
          to digital converters, ad2s1210, provides direct access via sysfs.
 
-choice
-       prompt "Resolution Control"
-       depends on AD2S1210
-       default AD2S1210_GPIO_NONE
-       help
-         In normal mode, the resolution of the digital output is selected
-         using the RES0 and RES1 input pins. In configuration mode, the
-         resolution is selected by setting the RES0 and RES1 bits in the
-         control regsiter. When switching between normal mode and configuration
-         mode, there are some schemes to keep them matchs.
-
-config AD2S1210_GPIO_INPUT
-       bool "read resolution from gpio pins"
-       help
-         GPIO pins are sampling RES0 and RES1 pins, read the resolution
-         settings from the GPIO pins.
-
-config AD2S1210_GPIO_OUTPUT
-       bool "set gpio pins to set resolution"
-       help
-         RES0 and RES1 pins are controlled by GPIOs, setting GPIO pins to
-         set the resolution.
-
-config AD2S1210_GPIO_NONE
-       bool "take the responsibility by user"
-
-endchoice