summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-18 09:12:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-18 09:12:51 +0100
commit7f9d04bc568d22e573a10e2a0a316599942786f7 (patch)
tree5cd3f32a22ebcc0f0faed657da2fbeb5dd5592c5 /Documentation/devicetree/bindings/iio
parent9a38450ac3d1f665fdbe06a2fd2e06fcf70defbc (diff)
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff)
Merge 4.15-rc4 into staging-next
We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/iio')
-rw-r--r--Documentation/devicetree/bindings/iio/pressure/hp03.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iio/pressure/hp03.txt b/Documentation/devicetree/bindings/iio/pressure/hp03.txt
index 54e7e70bcea5..831dbee7a5c3 100644
--- a/Documentation/devicetree/bindings/iio/pressure/hp03.txt
+++ b/Documentation/devicetree/bindings/iio/pressure/hp03.txt
@@ -10,7 +10,7 @@ Required properties:
Example:
-hp03@0x77 {
+hp03@77 {
compatible = "hoperf,hp03";
reg = <0x77>;
xclr-gpio = <&portc 0 0x0>;