aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/uio-howto.tmpl4
-rw-r--r--include/linux/uio_driver.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index 6116b93608df..b787e4721c90 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -393,12 +393,12 @@ offset = N * getpagesize();
393 393
394<itemizedlist> 394<itemizedlist>
395<listitem><para> 395<listitem><para>
396<varname>char *name</varname>: Required. The name of your driver as 396<varname>const char *name</varname>: Required. The name of your driver as
397it will appear in sysfs. I recommend using the name of your module for this. 397it will appear in sysfs. I recommend using the name of your module for this.
398</para></listitem> 398</para></listitem>
399 399
400<listitem><para> 400<listitem><para>
401<varname>char *version</varname>: Required. This string appears in 401<varname>const char *version</varname>: Required. This string appears in
402<filename>/sys/class/uio/uioX/version</filename>. 402<filename>/sys/class/uio/uioX/version</filename>.
403</para></listitem> 403</para></listitem>
404 404
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 20be327bfbb4..a0bb6bd2e5c1 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -76,8 +76,8 @@ struct uio_device;
76 */ 76 */
77struct uio_info { 77struct uio_info {
78 struct uio_device *uio_dev; 78 struct uio_device *uio_dev;
79 char *name; 79 const char *name;
80 char *version; 80 const char *version;
81 struct uio_mem mem[MAX_UIO_MAPS]; 81 struct uio_mem mem[MAX_UIO_MAPS];
82 struct uio_port port[MAX_UIO_PORT_REGIONS]; 82 struct uio_port port[MAX_UIO_PORT_REGIONS];
83 long irq; 83 long irq;