diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:49:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:49:10 +1000 |
| commit | f21f27b6b30cef5d8e9546dbee65dfca658a3e95 (patch) | |
| tree | 728b9f8bf5a2be78b223c9bc019d7931ad2db70f /drivers/staging/iio/accel/adis16240.h | |
| parent | 516c5bb5a0d2e8744f42d5ed8956e18385210663 (diff) | |
| parent | a6bff488e7267b65d7c6b2e0d5d2dd2257e65ea4 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/iio/accel/adis16240.h')
| -rw-r--r-- | drivers/staging/iio/accel/adis16240.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h index dcff43c75235..86e0f3ddb60a 100644 --- a/drivers/staging/iio/accel/adis16240.h +++ b/drivers/staging/iio/accel/adis16240.h @@ -127,7 +127,6 @@ * struct adis16240_state - device instance specific data * @us: actual spi_device * @work_trigger_to_ring: bh for triggered event handling - * @work_cont_thresh: CLEAN * @inter: used to check if new interrupt has been triggered * @last_timestamp: passing timestamp from th to bh of interrupt handler * @indio_dev: industrial I/O device structure @@ -139,7 +138,6 @@ struct adis16240_state { struct spi_device *us; struct work_struct work_trigger_to_ring; - struct iio_work_cont work_cont_thresh; s64 last_timestamp; struct iio_dev *indio_dev; struct iio_trigger *trig; |