diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:46:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:46:04 +0800 |
| commit | 08671464b7991cdbc2928243fbde2458357b2ce8 (patch) | |
| tree | 9df6728d1d3dc885e3dba5031c22408cb59a3eec /drivers/of/address.c | |
| parent | abacc500b7cddb62f7efc04d7c21d56375f42646 (diff) | |
| parent | 37e8e4f1465886675b03c37e9221658568ceb8f7 (diff) | |
Merge branch 'v3.18/topic/of-overlay' into linux-linaro-lsk-v3.18lsk-v3.18-15.12
Diffstat (limited to 'drivers/of/address.c')
| -rw-r--r-- | drivers/of/address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 9e77614391a0..d5f3b07177f9 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -889,7 +889,7 @@ EXPORT_SYMBOL(of_iomap); * return PTR_ERR(base); */ void __iomem *of_io_request_and_map(struct device_node *np, int index, - char *name) + const char *name) { struct resource res; void __iomem *mem; |