Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205779
b: refs/heads/master
c: 751a370
h: refs/heads/master
i:
  205777: 16660c0
  205775: 5d95aa7
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Jul 8, 2010
1 parent 332db71 commit f613298
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 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: 3d550fbace94a79b97cde94dca46f5477c817fed
refs/heads/master: 751a37007ff2b063b25ff357d2cbdc8af17b65d0
8 changes: 4 additions & 4 deletions trunk/drivers/staging/iio/iio.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
#include "chrdev.h"

/* IIO TODO LIST */
/* Static device specific elements (conversion factors etc)
* should be exported via sysfs
*
/*
* Provide means of adjusting timer accuracy.
* Currently assumes nano seconds.
*/
Expand Down Expand Up @@ -385,7 +383,9 @@ void iio_put(void);
**/
void iio_get(void);

/* Ring buffer related */
/**
* iio_device_get_chrdev_minor() - get an unused minor number
**/
int iio_device_get_chrdev_minor(void);
void iio_device_free_chrdev_minor(int val);

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/iio/industrialio-trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
* Any other suggestions?
*/


static DEFINE_IDR(iio_trigger_idr);
static DEFINE_SPINLOCK(iio_trigger_idr_lock);

Expand Down Expand Up @@ -284,7 +283,7 @@ int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
EXPORT_SYMBOL(iio_trigger_dettach_poll_func);

/**
* iio_trigger_read_currrent() trigger consumer sysfs query which trigger
* iio_trigger_read_currrent() - trigger consumer sysfs query which trigger
*
* For trigger consumers the current_trigger interface allows the trigger
* used by the device to be queried.
Expand Down

0 comments on commit f613298

Please sign in to comment.