diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 21:21:51 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 21:21:51 +0300 |
commit | ed63ba15d7830c30077dbb33c94242be01e45a18 (patch) | |
tree | 8165313975d57f025e640d33768dbc31493ce5b7 /Documentation/devicetree/bindings/iio/health | |
parent | 5015f8a5ced7039de354c1103b0912f5a64fab03 (diff) | |
parent | dd5a440a31fae6e459c0d6271dddd62825505361 (diff) | |
download | linux-ed63ba15d7830c30077dbb33c94242be01e45a18.tar.xz |
Merge 6.9-rc7 into char-misc-testing
We need the char-misc changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/iio/health')
-rw-r--r-- | Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml b/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml index a0fe0a818d86..205d352ab467 100644 --- a/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml +++ b/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml @@ -46,7 +46,7 @@ allOf: properties: compatible: contains: - const: maxim,max30100 + const: maxim,max30102 then: properties: maxim,green-led-current-microamp: false |