From f6ea734271927523e40a02dca168d0f5265d999c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 1 Oct 2011 18:42:47 +0200 Subject: [PATCH] --- yaml --- r: 272695 b: refs/heads/master c: 4c23c8da96de1af7ed88ee5258af613e8c03c3ad h: refs/heads/master i: 272693: 2cdf81d842940847cbfa141745856c09fce9796f 272691: eaaacd0ba30d724b6d67c637bc553b66a70e3f0e 272687: c12e531a770e31a8db33cb7cde20571d01cc01af v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dmtimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 88b21cc35073..87d4fd282fcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab4eb8b098c7591459b066cec0325a63792e463b +refs/heads/master: 4c23c8da96de1af7ed88ee5258af613e8c03c3ad diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c index de7896fd9b33..2def4e1990ed 100644 --- a/trunk/arch/arm/plat-omap/dmtimer.c +++ b/trunk/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", },