From: Jonathan Cameron Date: Sat, 25 Jun 2011 11:20:39 +0000 (+0100) Subject: staging:iio: one more fix for IIO_RING_BUFFER not enabled. X-Git-Tag: MMI-PSA29.97-13-9~18845^2~434 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=beeada734f9c6a11dbc37790848a19f3582440fc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging:iio: one more fix for IIO_RING_BUFFER not enabled. Same problem as seen and fixed in adis16204 et al. These were fixed by Randy in: staging: fix more iio builds when IIO_RING_BUFFER is not enabled Signed-off-by: Jonathan Cameron Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h index ed20333987bd..f1dd047aa5e0 100644 --- a/drivers/staging/iio/accel/adis16240.h +++ b/drivers/staging/iio/accel/adis16240.h @@ -141,7 +141,6 @@ struct adis16240_state { int adis16240_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! */ @@ -153,6 +152,7 @@ int adis16240_set_irq(struct iio_dev *indio_dev, bool enable); #define ADIS16240_SCAN_AUX_ADC 4 #define ADIS16240_SCAN_TEMP 5 +#ifdef CONFIG_IIO_RING_BUFFER void adis16240_remove_trigger(struct iio_dev *indio_dev); int adis16240_probe_trigger(struct iio_dev *indio_dev);