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/accel/adis16204.h | |
| 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/accel/adis16204.h')
| -rw-r--r-- | drivers/staging/iio/accel/adis16204.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h index 802fc57..3bb0490 100644 --- a/drivers/staging/iio/accel/adis16204.h +++ b/drivers/staging/iio/accel/adis16204.h @@ -82,7 +82,6 @@ struct adis16204_state { 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, @@ -91,6 +90,7 @@ enum adis16204_scan { 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); |