diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:45:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:45:10 -0700 |
| commit | 5a269ca9a6022b6fa19e68e92b38495844337abc (patch) | |
| tree | fbc974b8984dca91dac6fcf848470ffb9d504f4a /drivers/iio/adc | |
| parent | a34d5df85ebb8317592360b1611354f8b9853e55 (diff) | |
| parent | b475c59b113db1e66eb9527ffdec3c5241c847e5 (diff) | |
| download | linux-5a269ca9a6022b6fa19e68e92b38495844337abc.tar.bz2 | |
Merge tag 'iio-fixes-for-4.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
Second set of IIO fixes for the 4.6 cycle.
This lot are either dependent on patches from the merge window or just came
in recently enough that they ended up in this tree.
* core
- The watermark for the buffers was given a value that meant that it was
impossible to actually set the watermark to anything sensible.
* at91_adc
- Fix a build config dependency on HAS_IOMEM
* bmc150
- Fix wrong output on big endian systems
* bmg160
- Fix wrong output on big endian systems
- Fix an issue in which the regmap return value was stored to the buffer
rather than the value actually being read in a bulk read.
* inv_mpu6050
- Fix an indirect build config dependency on HAS_IOMEM
* max30100
- Fix an error in fifo check condition that leads to a double read of the
final reading.
* st_magn
- Make sure ST_MAGN_TRIGGER_SET_STATE is always defined to avoid a build
error for relatively obscure config combinations.
Diffstat (limited to 'drivers/iio/adc')
| -rw-r--r-- | drivers/iio/adc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index af4aea7b20f9..82c718c515a0 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -134,6 +134,7 @@ config AT91_ADC config AT91_SAMA5D2_ADC tristate "Atmel AT91 SAMA5D2 ADC" depends on ARCH_AT91 || COMPILE_TEST + depends on HAS_IOMEM help Say yes here to build support for Atmel SAMA5D2 ADC which is available on SAMA5D2 SoC family. |