mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-22 13:25:40 -05:00
Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
The deta angle and deta velocity channels were added in parallel with color temperature and chromacity so this merge had to assign a consistent order. I put the color related ones second. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
@@ -49,6 +49,8 @@ enum iio_chan_type {
|
||||
IIO_MASSCONCENTRATION,
|
||||
IIO_DELTA_ANGL,
|
||||
IIO_DELTA_VELOCITY,
|
||||
IIO_COLORTEMP,
|
||||
IIO_CHROMATICITY,
|
||||
};
|
||||
|
||||
enum iio_modifier {
|
||||
|
||||
Reference in New Issue
Block a user