aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/imu/adis16400.h
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-06-24 09:28:32 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-27 14:19:20 -0700
commit89089158d191ba0195b33ebf35f91ed217d44848 (patch)
tree457df791a4d5d2842de4d105cd25f1a31c2ef61f /drivers/staging/iio/imu/adis16400.h
parent2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff)
downloadkernel_samsung_smdk4412-89089158d191ba0195b33ebf35f91ed217d44848.zip
kernel_samsung_smdk4412-89089158d191ba0195b33ebf35f91ed217d44848.tar.gz
kernel_samsung_smdk4412-89089158d191ba0195b33ebf35f91ed217d44848.tar.bz2
Staging: fix more iio builds when IIO_RING_BUFFER is not enabled
Fix lots more build errors in staging/iio when CONFIG_IIO_RING_BUFFER is not enabled by moving enums and defines outside of the CONFIG_IIO_RING_BUFFER ifdef block. Examples (one from each driver; there were 116 total errors): drivers/staging/iio/accel/adis16204_core.c:437: error: 'ADIS16204_SCAN_SUPPLY' undeclared here (not in a function) drivers/staging/iio/accel/adis16209_core.c:410: error: 'ADIS16209_SCAN_SUPPLY' undeclared here (not in a function) drivers/staging/iio/gyro/adis16260_core.c:420: error: 'ADIS16260_SCAN_GYRO' undeclared here (not in a function) drivers/staging/iio/imu/adis16400_core.c:565: error: 'ADIS16400_SCAN_SUPPLY' undeclared here (not in a function) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/imu/adis16400.h')
-rw-r--r--drivers/staging/iio/imu/adis16400.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index db184d1..e87715b 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -158,7 +158,6 @@ struct adis16400_state {
int adis16400_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
/* At the moment triggers are only used for ring buffer
* filling. This may change!
*/
@@ -182,6 +181,7 @@ int adis16400_set_irq(struct iio_dev *indio_dev, bool enable);
#define ADIS16300_SCAN_INCLI_X 12
#define ADIS16300_SCAN_INCLI_Y 13
+#ifdef CONFIG_IIO_RING_BUFFER
void adis16400_remove_trigger(struct iio_dev *indio_dev);
int adis16400_probe_trigger(struct iio_dev *indio_dev);