diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/iio/adc/Kconfig | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/iio/adc/Kconfig')
| -rw-r--r-- | kernel/drivers/staging/iio/adc/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/drivers/staging/iio/adc/Kconfig b/kernel/drivers/staging/iio/adc/Kconfig index d0016ce6e..94ae4232e 100644 --- a/kernel/drivers/staging/iio/adc/Kconfig +++ b/kernel/drivers/staging/iio/adc/Kconfig @@ -5,7 +5,7 @@ menu "Analog to digital converters" config AD7606 tristate "Analog Devices AD7606 ADC driver" - depends on GPIOLIB + depends on GPIOLIB || COMPILE_TEST select IIO_BUFFER select IIO_TRIGGERED_BUFFER help @@ -39,7 +39,7 @@ config AD7606_IFACE_SPI config AD7780 tristate "Analog Devices AD7780 and similar ADCs driver" depends on SPI - depends on GPIOLIB + depends on GPIOLIB || COMPILE_TEST select AD_SIGMA_DELTA help Say yes here to build support for Analog Devices AD7170, AD7171, @@ -52,7 +52,7 @@ config AD7780 config AD7816 tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver" depends on SPI - depends on GPIOLIB + depends on GPIOLIB || COMPILE_TEST help Say yes here to build support for Analog Devices AD7816/7/8 temperature sensors and ADC. |