From 4bd543331a93769ac4847877ceaba9ad16c6d124 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 25 Jun 2011 12:20:39 +0100 Subject: [PATCH] --- yaml --- r: 259649 b: refs/heads/master c: beeada734f9c6a11dbc37790848a19f3582440fc h: refs/heads/master i: 259647: 82245db0c726042d730faa50a27de2c1713d05be v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/adis16240.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1811f930b49..b0da4c7bd0bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f88af7e7d338e067eff0c2b9e317da97488ff74c +refs/heads/master: beeada734f9c6a11dbc37790848a19f3582440fc diff --git a/trunk/drivers/staging/iio/accel/adis16240.h b/trunk/drivers/staging/iio/accel/adis16240.h index ed20333987bd..f1dd047aa5e0 100644 --- a/trunk/drivers/staging/iio/accel/adis16240.h +++ b/trunk/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);