summaryrefslogtreecommitdiff
path: root/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-08 18:27:47 +0300
committerIngo Molnar <mingo@kernel.org>2016-07-08 18:27:47 +0300
commit9e7f7f5425e6d1492109a537ee88c99b29580655 (patch)
tree81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
parent6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff)
parentf80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff)
downloadlinux-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.xz
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935')
-rw-r--r--Documentation/ABI/testing/sysfs-bus-iio-proximity-as39352
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
index 6708c5e264aa..33e96f740639 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -1,4 +1,4 @@
-What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
+What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
Date: March 2014
KernelVersion: 3.15
Contact: Matt Ranostay <mranostay@gmail.com>