summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/uio-howto.tmpl
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:35:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:35:56 -0700
commit589e1d10ff27c61669cc74a43620e6e769ea79dd (patch)
tree63c23b1407944f136b44949c7b03da74823ae757 /Documentation/DocBook/uio-howto.tmpl
parentdb7c17ecbf4d6328597047c4e4d6e8914945477c (diff)
parent1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
downloadtalos-obmc-linux-589e1d10ff27c61669cc74a43620e6e769ea79dd.tar.gz
talos-obmc-linux-589e1d10ff27c61669cc74a43620e6e769ea79dd.zip
Merge 3.16-rc5 into staging-next
We want the fixes in -rc5 in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/DocBook/uio-howto.tmpl')
-rw-r--r--Documentation/DocBook/uio-howto.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index 95618159e29b..bbe9c1fd5cef 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -766,10 +766,10 @@ framework to set up sysfs files for this region. Simply leave it alone.
<para>
The dynamic memory regions will be allocated when the UIO device file,
<varname>/dev/uioX</varname> is opened.
- Simiar to static memory resources, the memory region information for
+ Similar to static memory resources, the memory region information for
dynamic regions is then visible via sysfs at
<varname>/sys/class/uio/uioX/maps/mapY/*</varname>.
- The dynmaic memory regions will be freed when the UIO device file is
+ The dynamic memory regions will be freed when the UIO device file is
closed. When no processes are holding the device file open, the address
returned to userspace is ~0.
</para>
OpenPOWER on IntegriCloud