diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-29 09:49:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-29 09:49:28 -0700 |
| commit | 3dc50c1af30bf79c4fca3065acfb34adf05e90c2 (patch) | |
| tree | 38677ba815b1ec8f3c4ec3eea5dafb34f294b5f7 /drivers/iio/dac/Makefile | |
| parent | ac4ddad67acb9f67b42902939df64980fcbdbae5 (diff) | |
| parent | 9dd4694dafbd8b44ac4ca740beede18ca67d725f (diff) | |
| download | op-kernel-dev-3dc50c1af30bf79c4fca3065acfb34adf05e90c2.zip op-kernel-dev-3dc50c1af30bf79c4fca3065acfb34adf05e90c2.tar.gz | |
Merge tag 'iio-for-3.17b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second round of new drivers and cleanups for IIO in the 3.17 cycle.
New drivers
* mcp4902, mcp4912 and mcp4922 SPI DAC driver.
* max1027, max1029 and max1031 SPI ADC driver.
Cleanups
* cm32181 - use devm APIs to simplify error paths.
* ak8975 - use devm APIs to simplify error paths.
* ad9850 - drop some unused defines and an unnecessary goto.
* hmc5843 - add missing devices to the device id table and the documentation.
* ad9832 - small formatting cleanups.
* sca3000 - hide direct use of the stufftoread element by adding a
data_available function. This is a precursor for the addition of buffer
watermarks to the subsystem but stands as a good cleanup on its own.
Diffstat (limited to 'drivers/iio/dac/Makefile')
| -rw-r--r-- | drivers/iio/dac/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile index bb84ad6..1010764 100644 --- a/drivers/iio/dac/Makefile +++ b/drivers/iio/dac/Makefile @@ -18,3 +18,4 @@ obj-$(CONFIG_AD5686) += ad5686.o obj-$(CONFIG_AD7303) += ad7303.o obj-$(CONFIG_MAX517) += max517.o obj-$(CONFIG_MCP4725) += mcp4725.o +obj-$(CONFIG_MCP4922) += mcp4922.o |
