Merge tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[firefly-linux-kernel-4.4.55.git] / include / linux / of_address.h

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 8cb14eb393d6d178968cc2af6bbbffbc0bd0a1ff..d88e81be6368d2e2a07e34a8c0d28bbf9366a878 100644 (file)
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -106,7 +106,7 @@ extern int of_address_to_resource(struct device_node *dev, int index,
                                  struct resource *r);
 void __iomem *of_iomap(struct device_node *node, int index);
 void __iomem *of_io_request_and_map(struct device_node *device,
-                                       int index, char *name);
+                                       int index, const char *name);
 #else
 
 #include <linux/io.h>
@@ -123,7 +123,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 }
 
 static inline void __iomem *of_io_request_and_map(struct device_node *device,
-                                       int index, char *name)
+                                       int index, const char *name)
 {
        return IOMEM_ERR_PTR(-EINVAL);
 }