diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:14:19 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:14:19 +1100 |
commit | 20d6fb659242e1806bbe38e4fda6ecf876e87ecf (patch) | |
tree | c6ee9732cfd4f6d6c7c9834c3ca45905d6eb49cf /include/uapi | |
parent | e2717da9222fb5c00aa8f9330144553678731024 (diff) | |
parent | a769f30c7bd7cf917eea05a2b448f3588a87d767 (diff) |
Merge remote-tracking branch 'staging/staging-next'
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/iio/types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index e54d14a7f876..ffafd6c25a48 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -42,6 +42,7 @@ enum iio_chan_type { IIO_ELECTRICALCONDUCTIVITY, IIO_COUNT, IIO_INDEX, + IIO_GRAVITY, }; enum iio_modifier { |