diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 11:06:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 11:06:47 +0100 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /drivers/dma/iop-adma.c | |
| parent | sfc: Improve NIC internal error recovery (diff) | |
| parent | bonding: Fix device passed into ->ndo_neigh_setup(). (diff) | |
| download | linux-508827ff0ac3981d420edac64a70de7f4e304d38.tar.xz linux-508827ff0ac3981d420edac64a70de7f4e304d38.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 2 |
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", |