mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
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>
This commit is contained in:
parent
db3b9e990e
commit
5d4a6789d5
1 changed files with 5 additions and 3 deletions
|
@ -195,12 +195,14 @@ config MAX1363_RING_BUFFER
|
||||||
|
|
||||||
config LPC32XX_ADC
|
config LPC32XX_ADC
|
||||||
tristate "NXP LPC32XX ADC"
|
tristate "NXP LPC32XX ADC"
|
||||||
depends on ARCH_LPC32XX && !TOUCHSCREEN_LPC32XX
|
depends on ARCH_LPC32XX
|
||||||
help
|
help
|
||||||
Say yes here to build support for the integrated ADC inside the
|
Say yes here to build support for the integrated ADC inside the
|
||||||
LPC32XX SoC. Note that this feature uses the same hardware as 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
|
touchscreen driver, so you should either select only one of the two
|
||||||
(lpc32xx_adc or lpc32xx_ts). Provides direct access via sysfs.
|
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
|
config SPEAR_ADC
|
||||||
tristate "ST SPEAr ADC"
|
tristate "ST SPEAr ADC"
|
||||||
|
|
Loading…
Reference in a new issue