aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 14:40:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 14:40:23 -0400
commitce49b6289fa3878b190f15192e54bb23dca552b6 (patch)
tree666f246067e02968d9526fb3e1a5f6ba70c7a4ca /Documentation/ABI
parent0de10f9ea67d1046b1e16c91fa26accf23939aab (diff)
parent0ad1ea69545b1965be4c93ee03fdc685c6beb23d (diff)
Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree update from Greg KH: "Here's the large staging tree merge for 3.11-rc1 Huge thing here is the Lustre client code. Unfortunatly, due to it not building properly on a wide variety of different architectures (this was production code???), it is currently disabled from the build so as to not annoy people. Other than Lustre, there are loads of comedi patches, working to clean up that subsystem, iio updates and new drivers, and a load of cleanups from the OPW applicants in their quest to get a summer internship. All of these have been in the linux-next releases for a while (hence the Lustre code being disabled)" Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due to independent renamings in the staging driver cleanup and the USB tree.. * tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits) Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency""" staging: rtl8192u: fix line length in r819xU_phy.h staging: rtl8192u: rename variables in r819xU_phy.h staging: rtl8192u: fix comments in r819xU_phy.h staging: rtl8192u: fix whitespace in r819xU_phy.h staging: rtl8192u: fix newlines in r819xU_phy.c staging: comedi: unioxx5: use comedi_alloc_spriv() staging: comedi: unioxx5: fix unioxx5_detach() silicom: checkpatch: errors caused by macros Staging: silicom: remove the board_t typedef in bpctl_mod.c Staging: silicom: capitalize labels in the bp_media_type enum Staging: silicom: remove bp_media_type enum typedef staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c staging: rtl8192u: limit line size in r819xU_phy.c zram: allow request end to coincide with disksize staging: drm/imx: use generic irq chip unused field to block out invalid irqs staging: drm/imx: use generic irqchip staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers ...
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/testing/sysfs-bus-iio90
1 files changed, 45 insertions, 45 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 2e33dc6b2346..dda81ffae5cf 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -690,45 +690,45 @@ Description:
690 Actually start the buffer capture up. Will start trigger 690 Actually start the buffer capture up. Will start trigger
691 if first device and appropriate. 691 if first device and appropriate.
692 692
693What: /sys/bus/iio/devices/iio:deviceX/buffer/scan_elements 693What: /sys/bus/iio/devices/iio:deviceX/scan_elements
694KernelVersion: 2.6.37 694KernelVersion: 2.6.37
695Contact: linux-iio@vger.kernel.org 695Contact: linux-iio@vger.kernel.org
696Description: 696Description:
697 Directory containing interfaces for elements that will be 697 Directory containing interfaces for elements that will be
698 captured for a single triggered sample set in the buffer. 698 captured for a single triggered sample set in the buffer.
699 699
700What: /sys/.../buffer/scan_elements/in_accel_x_en 700What: /sys/.../iio:deviceX/scan_elements/in_accel_x_en
701What: /sys/.../buffer/scan_elements/in_accel_y_en 701What: /sys/.../iio:deviceX/scan_elements/in_accel_y_en
702What: /sys/.../buffer/scan_elements/in_accel_z_en 702What: /sys/.../iio:deviceX/scan_elements/in_accel_z_en
703What: /sys/.../buffer/scan_elements/in_anglvel_x_en 703What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
704What: /sys/.../buffer/scan_elements/in_anglvel_y_en 704What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
705What: /sys/.../buffer/scan_elements/in_anglvel_z_en 705What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
706What: /sys/.../buffer/scan_elements/in_magn_x_en 706What: /sys/.../iio:deviceX/scan_elements/in_magn_x_en
707What: /sys/.../buffer/scan_elements/in_magn_y_en 707What: /sys/.../iio:deviceX/scan_elements/in_magn_y_en
708What: /sys/.../buffer/scan_elements/in_magn_z_en 708What: /sys/.../iio:deviceX/scan_elements/in_magn_z_en
709What: /sys/.../buffer/scan_elements/in_timestamp_en 709What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en
710What: /sys/.../buffer/scan_elements/in_voltageY_supply_en 710What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
711What: /sys/.../buffer/scan_elements/in_voltageY_en 711What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en
712What: /sys/.../buffer/scan_elements/in_voltageY-voltageZ_en 712What: /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
713What: /sys/.../buffer/scan_elements/in_incli_x_en 713What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en
714What: /sys/.../buffer/scan_elements/in_incli_y_en 714What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en
715What: /sys/.../buffer/scan_elements/in_pressureY_en 715What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en
716What: /sys/.../buffer/scan_elements/in_pressure_en 716What: /sys/.../iio:deviceX/scan_elements/in_pressure_en
717KernelVersion: 2.6.37 717KernelVersion: 2.6.37
718Contact: linux-iio@vger.kernel.org 718Contact: linux-iio@vger.kernel.org
719Description: 719Description:
720 Scan element control for triggered data capture. 720 Scan element control for triggered data capture.
721 721
722What: /sys/.../buffer/scan_elements/in_accel_type 722What: /sys/.../iio:deviceX/scan_elements/in_accel_type
723What: /sys/.../buffer/scan_elements/in_anglvel_type 723What: /sys/.../iio:deviceX/scan_elements/in_anglvel_type
724What: /sys/.../buffer/scan_elements/in_magn_type 724What: /sys/.../iio:deviceX/scan_elements/in_magn_type
725What: /sys/.../buffer/scan_elements/in_incli_type 725What: /sys/.../iio:deviceX/scan_elements/in_incli_type
726What: /sys/.../buffer/scan_elements/in_voltageY_type 726What: /sys/.../iio:deviceX/scan_elements/in_voltageY_type
727What: /sys/.../buffer/scan_elements/in_voltage_type 727What: /sys/.../iio:deviceX/scan_elements/in_voltage_type
728What: /sys/.../buffer/scan_elements/in_voltageY_supply_type 728What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
729What: /sys/.../buffer/scan_elements/in_timestamp_type 729What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type
730What: /sys/.../buffer/scan_elements/in_pressureY_type 730What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type
731What: /sys/.../buffer/scan_elements/in_pressure_type 731What: /sys/.../iio:deviceX/scan_elements/in_pressure_type
732KernelVersion: 2.6.37 732KernelVersion: 2.6.37
733Contact: linux-iio@vger.kernel.org 733Contact: linux-iio@vger.kernel.org
734Description: 734Description:
@@ -752,29 +752,29 @@ Description:
752 For other storage combinations this attribute will be extended 752 For other storage combinations this attribute will be extended
753 appropriately. 753 appropriately.
754 754
755What: /sys/.../buffer/scan_elements/in_accel_type_available 755What: /sys/.../iio:deviceX/scan_elements/in_accel_type_available
756KernelVersion: 2.6.37 756KernelVersion: 2.6.37
757Contact: linux-iio@vger.kernel.org 757Contact: linux-iio@vger.kernel.org
758Description: 758Description:
759 If the type parameter can take one of a small set of values, 759 If the type parameter can take one of a small set of values,
760 this attribute lists them. 760 this attribute lists them.
761 761
762What: /sys/.../buffer/scan_elements/in_voltageY_index 762What: /sys/.../iio:deviceX/scan_elements/in_voltageY_index
763What: /sys/.../buffer/scan_elements/in_voltageY_supply_index 763What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
764What: /sys/.../buffer/scan_elements/in_accel_x_index 764What: /sys/.../iio:deviceX/scan_elements/in_accel_x_index
765What: /sys/.../buffer/scan_elements/in_accel_y_index 765What: /sys/.../iio:deviceX/scan_elements/in_accel_y_index
766What: /sys/.../buffer/scan_elements/in_accel_z_index 766What: /sys/.../iio:deviceX/scan_elements/in_accel_z_index
767What: /sys/.../buffer/scan_elements/in_anglvel_x_index 767What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
768What: /sys/.../buffer/scan_elements/in_anglvel_y_index 768What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
769What: /sys/.../buffer/scan_elements/in_anglvel_z_index 769What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
770What: /sys/.../buffer/scan_elements/in_magn_x_index 770What: /sys/.../iio:deviceX/scan_elements/in_magn_x_index
771What: /sys/.../buffer/scan_elements/in_magn_y_index 771What: /sys/.../iio:deviceX/scan_elements/in_magn_y_index
772What: /sys/.../buffer/scan_elements/in_magn_z_index 772What: /sys/.../iio:deviceX/scan_elements/in_magn_z_index
773What: /sys/.../buffer/scan_elements/in_incli_x_index 773What: /sys/.../iio:deviceX/scan_elements/in_incli_x_index
774What: /sys/.../buffer/scan_elements/in_incli_y_index 774What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index
775What: /sys/.../buffer/scan_elements/in_timestamp_index 775What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index
776What: /sys/.../buffer/scan_elements/in_pressureY_index 776What: /sys/.../iio:deviceX/scan_elements/in_pressureY_index
777What: /sys/.../buffer/scan_elements/in_pressure_index 777What: /sys/.../iio:deviceX/scan_elements/in_pressure_index
778KernelVersion: 2.6.37 778KernelVersion: 2.6.37
779Contact: linux-iio@vger.kernel.org 779Contact: linux-iio@vger.kernel.org
780Description: 780Description: