diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:19:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:19:40 +0200 |
| commit | 987aec39a74373c55c3bedd5c3c83896d78fd0a2 (patch) | |
| tree | 66aba6d4f166f269be95fe4d267d57efe533aefd /drivers/iio/imu/adis16400.h | |
| parent | firmware: add missing kfree for work on async call (diff) | |
| parent | Linux 4.1-rc7 (diff) | |
| download | linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.xz linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.zip | |
Merge 4.1-rc7 into driver-core-next
We want the fixes in this branch as well for testing and merge
resolution.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/imu/adis16400.h')
| -rw-r--r-- | drivers/iio/imu/adis16400.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h index 0916bf6b6c31..73b189c1c0fb 100644 --- a/drivers/iio/imu/adis16400.h +++ b/drivers/iio/imu/adis16400.h @@ -139,6 +139,7 @@ #define ADIS16400_NO_BURST BIT(1) #define ADIS16400_HAS_SLOW_MODE BIT(2) #define ADIS16400_HAS_SERIAL_NUMBER BIT(3) +#define ADIS16400_BURST_DIAG_STAT BIT(4) struct adis16400_state; @@ -165,6 +166,7 @@ struct adis16400_state { int filt_int; struct adis adis; + unsigned long avail_scan_mask[2]; }; /* At the moment triggers are only used for ring buffer |