History

Merge tag 'staging-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH: "Here is the big staging/iio driver pull request for 5.1-rc1. Lots of good IIO driver updates and cleanups in here as always. Combined with the removal of the xgifb driver, we have a net "loss" of over 9000 lines in the pull request, always a nice thing. As the outreachy application process is currently happening, there are loads of tiny checkpatch cleanup fixes all over the staging tree, which accounts for the majority of the fixups" * tag 'staging-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits) staging: mt7621-dma: remove license boilerplate text staging: mt7621-dma: add SPDX GPL-2.0+ license identifier Staging: ks7010: Replace typecast to int Staging: vt6655: Align a static function declaration staging: speakup: fix line over 80 characters. staging: mt7621-eth: Remove license boilerplate text staging: mt7621-eth: Add SPDX license identifier staging: ks7010: removed custom Michael MIC implementation. staging: rtl8192e: Fix space and suspect issue Staging: vt6655: Modify comment style of SPDX License Identifier Staging: vt6655: Modify comment style for SPDX-License-Identifier Staging: vt6655: Align a function declaration Staging: vt6655: Alignment of function declaration staging: rtl8712: Fix indentation issue staging: wilc1000: fix incorrent type in initializer staging: rtl8188eu: remove unused P2P_PRIVATE_IOCTL_SET_LEN staging: rtl8188eu: remove unused enum P2P_PROTO_WK_ID staging: rtl8723bs: Remove duplicated include from drv_types.h Staging: vt6655: Alignment should match open parenthesis staging: erofs: fix mis-acted TAIL merging behavior ...

Linus Torvalds committed 7 years ago

Commit e266ca32 parents e0f0ae8 1f08c4a335 files · +9603 −18624Browse files

Showing the changes to include/uapi/linux (1 of 335 files). Show all

Unified · Split

include/uapi/linux/iio/types.h+7−0
@@ -46,6 +46,7 @@ enum iio_chan_type { · 45 unmodified lines
46 IIO_GRAVITY,46 IIO_GRAVITY,
47 IIO_POSITIONRELATIVE,47 IIO_POSITIONRELATIVE,
48 IIO_PHASE,48 IIO_PHASE,
49 IIO_MASSCONCENTRATION,
49};50};
50 51
51enum iio_modifier {52enum iio_modifier {
@@ -87,6 +88,12 @@ enum iio_modifier { · 35 unmodified lines
87 IIO_MOD_VOC,88 IIO_MOD_VOC,
88 IIO_MOD_LIGHT_UV,89 IIO_MOD_LIGHT_UV,
89 IIO_MOD_LIGHT_DUV,90 IIO_MOD_LIGHT_DUV,
91 IIO_MOD_PM1,
92 IIO_MOD_PM2P5,
93 IIO_MOD_PM4,
94 IIO_MOD_PM10,
95 IIO_MOD_ETHANOL,
96 IIO_MOD_H2,
90};97};
91 98
92enum iio_event_type {99enum iio_event_type {