git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
Documentation
/
DocBook
/
uio-howto.tmpl
diff --git
a/Documentation/DocBook/uio-howto.tmpl
b/Documentation/DocBook/uio-howto.tmpl
index
54883de
..
ac3d001
100644
(file)
--- a/
Documentation/DocBook/uio-howto.tmpl
+++ b/
Documentation/DocBook/uio-howto.tmpl
@@
-520,6
+520,11
@@
Here's a description of the fields of <varname>struct uio_mem</varname>:
</para>
<itemizedlist>
</para>
<itemizedlist>
+<listitem><para>
+<varname>const char *name</varname>: Optional. Set this to help identify
+the memory region, it will show up in the corresponding sysfs node.
+</para></listitem>
+
<listitem><para>
<varname>int memtype</varname>: Required if the mapping is used. Set this to
<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
<listitem><para>
<varname>int memtype</varname>: Required if the mapping is used. Set this to
<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
@@
-553,7
+558,7
@@
instead to remember such an address.
</itemizedlist>
<para>
</itemizedlist>
<para>
-Please do not touch the <varname>
kobj
</varname> element of
+Please do not touch the <varname>
map
</varname> element of
<varname>struct uio_mem</varname>! It is used by the UIO framework
to set up sysfs files for this mapping. Simply leave it alone.
</para>
<varname>struct uio_mem</varname>! It is used by the UIO framework
to set up sysfs files for this mapping. Simply leave it alone.
</para>