diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:59 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:59 +0100 |
commit | 3cdcff497976a60ccbef37c67713c3acea0d35eb (patch) | |
tree | e870d165a7c6e99fd464b9962c679cec8bb726f2 /drivers | |
parent | 29ac6ac467831e9b261465f13e871bc6bf9324a4 (diff) | |
parent | 5db57dace1c80bb95a979f808149c7f01ea9884b (diff) | |
download | barebox-3cdcff497976a60ccbef37c67713c3acea0d35eb.tar.gz barebox-3cdcff497976a60ccbef37c67713c3acea0d35eb.tar.xz |
Merge branch 'for-next/mips'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 943deb489c..a70fbb217a 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -380,7 +380,7 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n if (IS_ERR(res)) return ERR_CAST(res); - return (void __force __iomem *)res->start; + return IOMEM(res->start); } EXPORT_SYMBOL(dev_request_mem_region_by_name); @@ -396,7 +396,7 @@ void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num) if (IS_ERR(res)) return NULL; - return (void __force __iomem *)res->start; + return IOMEM(res->start); } EXPORT_SYMBOL(dev_request_mem_region_err_null); |