Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249820
b: refs/heads/master
c: cf96ffd
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed May 19, 2011
1 parent edf4c6d commit c8c9605
Show file tree
Hide file tree
Showing 5 changed files with 221 additions and 329 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: cbcdf4dd4fb109141b60da7b224895b88dbdff19
refs/heads/master: cf96ffd8c2ed7728f8abb2b6122da78319466a2d
4 changes: 1 addition & 3 deletions trunk/drivers/staging/iio/accel/adis16201.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct adis16201_state {
struct mutex buf_lock;
};

int adis16201_set_irq(struct device *dev, bool enable);
int adis16201_set_irq(struct iio_dev *indio_dev, bool enable);

#ifdef CONFIG_IIO_RING_BUFFER
enum adis16201_scan {
Expand All @@ -102,8 +102,6 @@ ssize_t adis16201_read_data_from_ring(struct device *dev,
int adis16201_configure_ring(struct iio_dev *indio_dev);
void adis16201_unconfigure_ring(struct iio_dev *indio_dev);

int adis16201_initialize_ring(struct iio_ring_buffer *ring);
void adis16201_uninitialize_ring(struct iio_ring_buffer *ring);
#else /* CONFIG_IIO_RING_BUFFER */

static inline void adis16201_remove_trigger(struct iio_dev *indio_dev)
Expand Down
Loading

0 comments on commit c8c9605

Please sign in to comment.