Merge git://git.infradead.org/~dwmw2/cafe-2.6

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

diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index dc9bd101ca14c24ed3967cc98587ccd8b85522b7..4b51d42e1419d2cf0f27d2c40f448f474005e912 100644 (file)
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -46,8 +46,8 @@ struct iommu_table;
  */
 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;