diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 14:35:09 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 14:35:09 (GMT) |
commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
tree | acbab68f802fadbff85590c139c87dc199bb465d /drivers/staging/iio/gyro | |
parent | af0c25c4876305dfa1a25ac1cc92d3cddfa476a6 (diff) | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
download | linux-fsl-qoriq-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.xz |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/gyro')
-rw-r--r-- | drivers/staging/iio/gyro/adis16260.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h index 4059fe9..969b624 100644 --- a/drivers/staging/iio/gyro/adis16260.h +++ b/drivers/staging/iio/gyro/adis16260.h @@ -102,7 +102,6 @@ struct adis16260_state { int adis16260_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! */ @@ -113,6 +112,7 @@ int adis16260_set_irq(struct iio_dev *indio_dev, bool enable); #define ADIS16260_SCAN_TEMP 3 #define ADIS16260_SCAN_ANGL 4 +#ifdef CONFIG_IIO_RING_BUFFER void adis16260_remove_trigger(struct iio_dev *indio_dev); int adis16260_probe_trigger(struct iio_dev *indio_dev); |