Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6-omap-h63xx.git] / include / linux / uio_driver.h

diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 20be327bfbb45d12913ded11edbd0d2098e8168b..5dcc9ff72f6954874faa92c13a351ee548a51962 100644 (file)
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -22,6 +22,7 @@ struct uio_map;
 
 /**
  * struct uio_mem - description of a UIO memory region
+ * @name:              name of the memory region for identification
  * @addr:              address of the device's memory
  * @size:              size of IO
  * @memtype:           type of memory addr points to
@@ -29,6 +30,7 @@ struct uio_map;
  * @map:               for use by the UIO core only.
  */
 struct uio_mem {
+       const char              *name;
        unsigned long           addr;
        unsigned long           size;
        int                     memtype;
@@ -42,12 +44,14 @@ struct uio_portio;
 
 /**
  * struct uio_port - description of a UIO port region
+ * @name:              name of the port region for identification
  * @start:             start of port region
  * @size:              size of port region
  * @porttype:          type of port (see UIO_PORT_* below)
  * @portio:            for use by the UIO core only.
  */
 struct uio_port {
+       const char              *name;
        unsigned long           start;
        unsigned long           size;
        int                     porttype;
@@ -76,8 +80,8 @@ struct uio_device;
  */
 struct uio_info {
        struct uio_device       *uio_dev;
-       char                    *name;
-       char                    *version;
+       const char              *name;
+       const char              *version;
        struct uio_mem          mem[MAX_UIO_MAPS];
        struct uio_port         port[MAX_UIO_PORT_REGIONS];
        long                    irq;