diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:23:39 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:23:39 +0800 |
| commit | 74bc3fe5f5fbb50d63fd002ce240cc7bca236db1 (patch) | |
| tree | ef6b70cbf7a2be62f445deaf714c6701567233a7 /include/linux/of_address.h | |
| parent | 3169cab06bf18e3b6f5bd68dd253502aba0eb9c4 (diff) | |
| parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
For dtb file cleanup in 'make distclean'
Diffstat (limited to 'include/linux/of_address.h')
| -rw-r--r-- | include/linux/of_address.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 8cb14eb393d6..d88e81be6368 100644 --- 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); } |