diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 19:59:04 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 19:59:04 +0400 |
| commit | e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b (patch) | |
| tree | 389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 /drivers/iio/iio_core.h | |
| parent | 3ffdea3feca9e2c95c2e93e217d77c9c368f747a (diff) | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
| download | linux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.tar.xz | |
Merge 3.12-rc2 into staging-next.
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/iio_core.h')
| -rw-r--r-- | drivers/iio/iio_core.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/iio/iio_core.h b/drivers/iio/iio_core.h index 6be5ab864b1a..9209f47b273a 100644 --- a/drivers/iio/iio_core.h +++ b/drivers/iio/iio_core.h @@ -49,11 +49,15 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, #define iio_buffer_poll_addr (&iio_buffer_poll) #define iio_buffer_read_first_n_outer_addr (&iio_buffer_read_first_n_outer) +void iio_disable_all_buffers(struct iio_dev *indio_dev); + #else #define iio_buffer_poll_addr NULL #define iio_buffer_read_first_n_outer_addr NULL +static inline void iio_disable_all_buffers(struct iio_dev *indio_dev) {} + #endif int iio_device_register_eventset(struct iio_dev *indio_dev); |