diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-23 07:22:59 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-23 07:27:23 -0400 |
| commit | 1af447bd8cbfb808a320885d214555fb2d32e6e6 (patch) | |
| tree | 8b24a66b9d66b25479ffff4999a2d5ec9ffb0010 /lib | |
| parent | 5442e9fbd7c23172a1c9bc736629cd123a9923f0 (diff) | |
| parent | 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 (diff) | |
Merge branch 'clockevents/3.17' of git://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents from Danel Lezcano:
* New timer driver for the Cirrus Logic CLPS711X SoC
* New driver for the Mediatek SoC which includes:
* A new function for of, acked by Rob Herring
* Move the PXA driver to drivers/clocksource, add DT support
* Optimization of the exynos_mct driver
* DT support for the renesas timers family.
* Some Kconfig and driver fixlets
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/devres.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/devres.c b/lib/devres.c index f562bf6ff71d..bb632484a860 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
| @@ -86,8 +86,6 @@ void devm_iounmap(struct device *dev, void __iomem *addr) | |||
| 86 | } | 86 | } |
| 87 | EXPORT_SYMBOL(devm_iounmap); | 87 | EXPORT_SYMBOL(devm_iounmap); |
| 88 | 88 | ||
| 89 | #define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err) | ||
| 90 | |||
| 91 | /** | 89 | /** |
| 92 | * devm_ioremap_resource() - check, request region, and ioremap resource | 90 | * devm_ioremap_resource() - check, request region, and ioremap resource |
| 93 | * @dev: generic device to handle the resource for | 91 | * @dev: generic device to handle the resource for |