aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/iop-adma.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 11:59:10 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 11:59:10 +0100
commit49d2d266adff27793fed247a2e9e672d59b6ddc6 (patch)
treeaa23052f8b6e9f1a96e56873c940eef7110f0013 /drivers/dma/iop-adma.c
parentMerge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core (diff)
parentLinux 2.6.29-rc7 (diff)
downloadlinux-dev-49d2d266adff27793fed247a2e9e672d59b6ddc6.tar.xz
linux-dev-49d2d266adff27793fed247a2e9e672d59b6ddc6.zip
Merge commit 'v2.6.29-rc7' into sched/core
Diffstat (limited to 'drivers/dma/iop-adma.c')
-rw-r--r--drivers/dma/iop-adma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index ea5440dd10dc..647374acba94 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1401,7 +1401,7 @@ MODULE_ALIAS("platform:iop-adma");
static struct platform_driver iop_adma_driver = {
.probe = iop_adma_probe,
- .remove = iop_adma_remove,
+ .remove = __devexit_p(iop_adma_remove),
.driver = {
.owner = THIS_MODULE,
.name = "iop-adma",