summaryrefslogtreecommitdiffstats
path: root/Documentation/driver-api/fpga/fpga-mgr.rst
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-08 15:43:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-08 15:43:12 +0200
commit4e1a606d552de03aec2b1fd157011bf012fcc870 (patch)
tree7d7683fc2d5286a36782df572f475abb3bb2e173 /Documentation/driver-api/fpga/fpga-mgr.rst
parentTTY: sn_console: Replace spin_is_locked() with spin_trylock() (diff)
parentLinux 4.19-rc7 (diff)
downloadlinux-4e1a606d552de03aec2b1fd157011bf012fcc870.tar.xz
linux-4e1a606d552de03aec2b1fd157011bf012fcc870.zip
Merge 4.19-rc7 into tty-next
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/driver-api/fpga/fpga-mgr.rst')
-rw-r--r--Documentation/driver-api/fpga/fpga-mgr.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/driver-api/fpga/fpga-mgr.rst b/Documentation/driver-api/fpga/fpga-mgr.rst
index 4b3825da48d9..82b6dbbd31cd 100644
--- a/Documentation/driver-api/fpga/fpga-mgr.rst
+++ b/Documentation/driver-api/fpga/fpga-mgr.rst
@@ -184,6 +184,11 @@ API for implementing a new FPGA Manager driver
API for programming an FPGA
---------------------------
+FPGA Manager flags
+
+.. kernel-doc:: include/linux/fpga/fpga-mgr.h
+ :doc: FPGA Manager flags
+
.. kernel-doc:: include/linux/fpga/fpga-mgr.h
:functions: fpga_image_info