Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / asm-powerpc / vio.h

diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index dc9bd10..0117b54 100644 (file)
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -45,9 +45,8 @@ struct iommu_table;
  * The vio_dev structure is used to describe virtual I/O devices.
  */
 struct vio_dev {
-       struct iommu_table *iommu_table;     /* vio_map_* uses this */
-       char *name;
-       char *type;
+       const char *name;
+       const char *type;
        uint32_t unit_address;
        unsigned int irq;
        struct device dev;