diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 13:50:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-07 13:50:54 +1100 |
| commit | ebd2b635ff17d7455605745b11e5f4afabe5167d (patch) | |
| tree | 5fd0348763e73907d57e5d79d6b799d02847846c /include/uapi | |
| parent | f9a6096a1687106db4a4a755c3424b3f6b2e382c (diff) | |
| parent | d3337eb1e113bed287b58677e755c807be88d507 (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/iio/types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index 2f8b11722204..7c63bd67c36e 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -35,6 +35,8 @@ enum iio_chan_type { IIO_ENERGY, IIO_DISTANCE, IIO_VELOCITY, + IIO_CONCENTRATION, + IIO_RESISTANCE, }; enum iio_modifier { @@ -72,6 +74,8 @@ enum iio_modifier { IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z, IIO_MOD_I, IIO_MOD_Q, + IIO_MOD_CO2, + IIO_MOD_VOC, }; enum iio_event_type { |