[GIT PULL] dmtimer changes for v3.2 merge window
From: tony@atomide.com (Tony Lindgren)
Date: 2011-10-04 00:07:43
Also in:
linux-omap
* Arnd Bergmann [off-list ref] [111001 09:12]:
On Friday 30 September 2011 22:13:42 Arnd Bergmann wrote:quoted
On Thursday 29 September 2011, Tony Lindgren wrote:quoted
Please pull omap dmtimer changes from: git://github.com/tmlind/linux.git dmtimer This series completes the system timer separation from the driver like features. It also adds support for v2 ip that is available for some timers starting with omap4. After this series arch/arm/plat-omap/dmtimer.c could be moved to live under drivers somewhere, but there is still discussion going on which features should be supported in a generic way. This series depends on the cleanup you pulled earlier. As this series adds some new features like runtime PM suppport, I've kept it separate from cleanup.Looks really nice. I've put it into another top-level branch named next/dmtimer for now. I'm open for suggestions on whether I should generally push branches like this separately Linuswards or better aggregate multiple standalone features into a single branch.I'm adding the patch below to fix a trivial randconfig build regression in this series. Arnd 8<--- Subject: [PATCH] ARM: omap: use __devexit_p in dmtimer driver The omap_dm_timer_remove function gets discarded when CONFIG_HOTPLUG is not set, so we must not reference it unconditionally. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Great, thanks! Acked-by: Tony Lindgren <tony@atomide.com>
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index de7896f..2def4e1 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c@@ -723,7 +723,7 @@ static int __devexit omap_dm_timer_remove(struct platform_device *pdev) static struct platform_driver omap_dm_timer_driver = { .probe = omap_dm_timer_probe, - .remove = omap_dm_timer_remove, + .remove = __devexit_p(omap_dm_timer_remove), .driver = { .name = "omap_timer", }, --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html