Merge tag 'v3.5-rc2'

[karo-tx-linux.git] / Documentation / gpio.txt

diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 620a07844e8cee6af9fe7415c7cd016766252250..e08a883de36e316715bcdacebf9670f952c0de02 100644 (file)
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -322,6 +322,9 @@ where 'flags' is currently defined to specify the following properties:
        * GPIOF_OPEN_DRAIN      - gpio pin is open drain type.
        * GPIOF_OPEN_SOURCE     - gpio pin is open source type.
 
+       * GPIOF_EXPORT_DIR_FIXED        - export gpio to sysfs, keep direction
+       * GPIOF_EXPORT_DIR_CHANGEABLE   - also export, allow changing direction
+
 since GPIOF_INIT_* are only valid when configured as output, so group valid
 combinations as: