diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 11:48:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 11:48:07 -0700 |
| commit | d210267741fb2a8b6d741d9040703683a39087f4 (patch) | |
| tree | bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb /include/linux/iio/kfifo_buf.h | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
| parent | 5bb196ad29c58c3e69dde8ed34b99a07c0719e7f (diff) | |
| download | linux-d210267741fb2a8b6d741d9040703683a39087f4.tar.gz linux-d210267741fb2a8b6d741d9040703683a39087f4.tar.bz2 linux-d210267741fb2a8b6d741d9040703683a39087f4.zip | |
Merge 3.4-rc5 into staging-next
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/iio/kfifo_buf.h')
| -rw-r--r-- | include/linux/iio/kfifo_buf.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/iio/kfifo_buf.h b/include/linux/iio/kfifo_buf.h new file mode 100644 index 000000000000..014d5a13b32b --- /dev/null +++ b/include/linux/iio/kfifo_buf.h @@ -0,0 +1,8 @@ + +#include <linux/kfifo.h> +#include <linux/iio/iio.h> +#include <linux/iio/buffer.h> + +struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); +void iio_kfifo_free(struct iio_buffer *r); + |