Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267543
b: refs/heads/master
c: 7d43817
h: refs/heads/master
i:
  267541: 0df72a2
  267539: 1a374b3
  267535: 3b30a70
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent efcbe59 commit 6953e88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d34dbee8ac8e953eb7115804bf406990f976b942
refs/heads/master: 7d43817803c6a1786d60834ea1a110360b098085
3 changes: 3 additions & 0 deletions trunk/drivers/staging/iio/iio.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/* The industrial I/O core
*
* Copyright (c) 2008 Jonathan Cameron
Expand Down Expand Up @@ -75,6 +76,8 @@ enum iio_chan_info_enum {
IIO_CHAN_INFO_PEAK_SEPARATE,
IIO_CHAN_INFO_PEAK_SCALE_SHARED,
IIO_CHAN_INFO_PEAK_SCALE_SEPARATE,
IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED,
IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE,
};

/**
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ static const char * const iio_chan_info_postfix[] = {
[IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias",
[IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw",
[IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale",
[IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED/2]
= "quadrature_correction_raw",
};

/* Return a negative errno on failure */
Expand Down

0 comments on commit 6953e88

Please sign in to comment.