Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259649
b: refs/heads/master
c: beeada7
h: refs/heads/master
i:
  259647: 82245db
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent f7d9dda commit 4bd5433
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f88af7e7d338e067eff0c2b9e317da97488ff74c
refs/heads/master: beeada734f9c6a11dbc37790848a19f3582440fc
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16240.h
Original file line number Diff line number Diff line change
Expand Up @@ -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!
*/
Expand All @@ -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);

Expand Down

0 comments on commit 4bd5433

Please sign in to comment.