git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
dmtimer.c
diff --git
a/arch/arm/plat-omap/dmtimer.c
b/arch/arm/plat-omap/dmtimer.c
index
de7896f
..
2def4e1
100644
(file)
--- 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",
},