diff options
| author | Greg Kroah-Hartman <[email protected]> | 2012-11-21 12:32:57 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-11-21 12:32:57 -0800 |
| commit | 3ce14acb90c9217bcbc9092cb7e404a5bf55efaf (patch) | |
| tree | ef3e19fd0e7e759e6e16cc6d96864ed8532bd66d /include/linux/iio/buffer.h | |
| parent | acf1cf6a1c0966ef64a73083ca985605a12b032d (diff) | |
| parent | be7fd3b86ad2f2a8db58decc15d2274b0c89c23b (diff) | |
Merge tag 'iio-for-3.8e' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
From Jonathan:
"Fifth round of new IIO drivers, cleanups and fixes for the 3.8 cycle.
Here we have a number of minor fixes.
* a quirk for the hid sensor driver should be a boolean option.
* return an error for a failed memdup in the hid sensor driver.
* Fix a return value in adt7410.
* A double free in the IIO event infrastructure.
* Disabling interrupts in tsl2563 was wrong (never been correct!)
* Incorrect signature for the iio_buffer_register stub
* Incorrect return for isl29018 write_raw callback.
* A number of minor fixes as part of the various rework series.
New drivers and major rework.
* Introduce and use extensively an adis library for numerous spi
Analog Devices mems sensors. This then moves out of staging.
* Lots of new stuff then added to this library to support newer
sensors.
* New drivers for ADIS16136 and ADIS16480 and similar.
* Core support for barometric pressure sensors.
* ad7298 cleanup and move out of staging.
The bulk of this is from Lars-Peter Clausen. He's been rather
busy!"
Diffstat (limited to 'include/linux/iio/buffer.h')
| -rw-r--r-- | include/linux/iio/buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h index 027040569180..f3eea18fdf46 100644 --- a/include/linux/iio/buffer.h +++ b/include/linux/iio/buffer.h @@ -195,7 +195,7 @@ bool iio_validate_scan_mask_onehot(struct iio_dev *indio_dev, #else /* CONFIG_IIO_BUFFER */ static inline int iio_buffer_register(struct iio_dev *indio_dev, - struct iio_chan_spec *channels, + const struct iio_chan_spec *channels, int num_channels) { return 0; |