diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 16:12:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 16:12:23 -0400 |
| commit | b4e8459947e167f326795bf3dbc06c04b2a12d1d (patch) | |
| tree | 0cdc972280461f48b3eb0d4c013f3e20bfb18564 /drivers/iio/adc | |
| parent | cb9cfd7ed3f6ed4c40167b4251cdb382b6b3ba1c (diff) | |
| parent | 10a485c55ae8d313194afc7a8c65df3ac7c048a1 (diff) | |
Merge tag 'iio-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second set of new functionality for IIO in the 3.13 cycle - with bug fixes for first set.
This is a small, mainly to get a couple of compile bug related fixes into
the tree ASAP.
New device support:
1) Add ad5446 dac support to the ad5641 driver.
New functionality and cleanups:
1) Optional power supply regulators for the st pressure sensors drivers using
the new optional regulator interface.
2) Bit of tidying up of naming in the sysfs trigger.
Bug fixes from the previous series:
1) Missing select IIO_BUFFER for ti_am335x_adc
2) Drop a bonus bracket in iio-trig-bfin-timmer
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 8b885188b839..2209f28441e9 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig | |||
| @@ -177,6 +177,7 @@ config TI_ADC081C | |||
| 177 | config TI_AM335X_ADC | 177 | config TI_AM335X_ADC |
| 178 | tristate "TI's AM335X ADC driver" | 178 | tristate "TI's AM335X ADC driver" |
| 179 | depends on MFD_TI_AM335X_TSCADC | 179 | depends on MFD_TI_AM335X_TSCADC |
| 180 | select IIO_BUFFER | ||
| 180 | select IIO_KFIFO_BUF | 181 | select IIO_KFIFO_BUF |
| 181 | help | 182 | help |
| 182 | Say yes here to build support for Texas Instruments ADC | 183 | Say yes here to build support for Texas Instruments ADC |