git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
[pandora-kernel.git]
/
drivers
/
staging
/
iio
/
accel
/
adis16204.h
diff --git
a/drivers/staging/iio/accel/adis16204.h
b/drivers/staging/iio/accel/adis16204.h
index
5310a42
..
1690c0d
100644
(file)
--- a/
drivers/staging/iio/accel/adis16204.h
+++ b/
drivers/staging/iio/accel/adis16204.h
@@
-84,7
+84,6
@@
struct adis16204_state {
int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);
int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
enum adis16204_scan {
ADIS16204_SCAN_SUPPLY,
ADIS16204_SCAN_ACC_X,
enum adis16204_scan {
ADIS16204_SCAN_SUPPLY,
ADIS16204_SCAN_ACC_X,
@@
-93,6
+92,7
@@
enum adis16204_scan {
ADIS16204_SCAN_TEMP,
};
ADIS16204_SCAN_TEMP,
};
+#ifdef CONFIG_IIO_RING_BUFFER
void adis16204_remove_trigger(struct iio_dev *indio_dev);
int adis16204_probe_trigger(struct iio_dev *indio_dev);
void adis16204_remove_trigger(struct iio_dev *indio_dev);
int adis16204_probe_trigger(struct iio_dev *indio_dev);