diff options
| author | Dmitry Torokhov <[email protected]> | 2015-02-10 19:35:36 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2015-02-10 19:35:36 +0000 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /lib/devres.c | |
| parent | Input: elantech - add more Fujtisu notebooks to force crc_enabled (diff) | |
| parent | Input: elan_i2c - fix wrong %p extension (diff) | |
| download | kernel-4ba24fef3eb3b142197135223b90ced2f319cd53.tar.gz kernel-4ba24fef3eb3b142197135223b90ced2f319cd53.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'lib/devres.c')
| -rw-r--r-- | lib/devres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/devres.c b/lib/devres.c index f4a195a6efe4..0f1dd2e9d2c1 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -23,7 +23,7 @@ static int devm_ioremap_match(struct device *dev, void *res, void *match_data) * Managed ioremap(). Map is automatically unmapped on driver detach. */ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, - unsigned long size) + resource_size_t size) { void __iomem **ptr, *addr; @@ -52,7 +52,7 @@ EXPORT_SYMBOL(devm_ioremap); * detach. */ void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, - unsigned long size) + resource_size_t size) { void __iomem **ptr, *addr; |