staging: iio: lpc32xx-adc: Remove driver conflict due to device tree

Previously, the touchscreen and ADC drivers of the LPC32xx SoC had a Kconfig
conflict declared because they use the same hardware. Upon the introduction of
device tree support in both drivers, the conflict must be removed to enable
the same kernel to support different hardware (configured via the device tree).

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index ec006e749ffe..9ae5467ca420 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -195,12 +195,14 @@ config MAX1363_RING_BUFFER
 
 config LPC32XX_ADC
         tristate "NXP LPC32XX ADC"
-        depends on ARCH_LPC32XX && !TOUCHSCREEN_LPC32XX
+        depends on ARCH_LPC32XX
         help
           Say yes here to build support for the integrated ADC inside the
           LPC32XX SoC. Note that this feature uses the same hardware as the
-          touchscreen driver, so you can only select one of the two drivers
-          (lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs.
+          touchscreen driver, so you should either select only one of the two
+          drivers (lpc32xx_adc or lpc32xx_ts) or, in the OpenFirmware case,
+          activate only one via device tree selection.  Provides direct access
+          via sysfs.
 
 config SPEAR_ADC
         tristate "ST SPEAr ADC"