diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-06 05:48:24 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-06 05:48:24 +0800 |
| commit | 1223ad3240487ba6c2304b887cfb4da5cada04d8 (patch) | |
| tree | c958d0b4755482d8c8b8f318842a6d1ea3d27af2 /include | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| parent | 852afe99fc1c2d2b1376e49f128a3b929e811f2d (diff) | |
| download | linux-3.10-1223ad3240487ba6c2304b887cfb4da5cada04d8.tar.gz linux-3.10-1223ad3240487ba6c2304b887cfb4da5cada04d8.tar.bz2 linux-3.10-1223ad3240487ba6c2304b887cfb4da5cada04d8.zip | |
Merge tag 'iio-fixes-for-3.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
"First round of iio fixes post the 3.9 merge window.
1) Some little fixes for the ad5064 dac driver.
2) A build warning 'fix' for a false positive in st_sensors
3) A couple of missing dependencies on IIO_BUFFER.
So nothing major and these mostly showed the advantages of the randconfig
builds various people have performed."
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iio/common/st_sensors.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h index 1f86a97ab2e..8bd12be0b02 100644 --- a/include/linux/iio/common/st_sensors.h +++ b/include/linux/iio/common/st_sensors.h @@ -227,14 +227,17 @@ struct st_sensor_data { }; #ifdef CONFIG_IIO_BUFFER +irqreturn_t st_sensors_trigger_handler(int irq, void *p); + +int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf); +#endif + +#ifdef CONFIG_IIO_TRIGGER int st_sensors_allocate_trigger(struct iio_dev *indio_dev, const struct iio_trigger_ops *trigger_ops); void st_sensors_deallocate_trigger(struct iio_dev *indio_dev); -irqreturn_t st_sensors_trigger_handler(int irq, void *p); - -int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf); #else static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev, const struct iio_trigger_ops *trigger_ops) |