diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 10:27:30 -0500 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/dma/sa11x0-dma.c | |
| parent | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff) | |
| parent | d01723479e6a6c70c83295f7847477a016d5e14a (diff) | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/dma/sa11x0-dma.c')
| -rw-r--r-- | drivers/dma/sa11x0-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c index 2ad628df8223..461a91ab70bb 100644 --- a/drivers/dma/sa11x0-dma.c +++ b/drivers/dma/sa11x0-dma.c | |||
| @@ -967,7 +967,7 @@ static int sa11x0_dma_probe(struct platform_device *pdev) | |||
| 967 | return ret; | 967 | return ret; |
| 968 | } | 968 | } |
| 969 | 969 | ||
| 970 | static int __devexit sa11x0_dma_remove(struct platform_device *pdev) | 970 | static int sa11x0_dma_remove(struct platform_device *pdev) |
| 971 | { | 971 | { |
| 972 | struct sa11x0_dma_dev *d = platform_get_drvdata(pdev); | 972 | struct sa11x0_dma_dev *d = platform_get_drvdata(pdev); |
| 973 | unsigned pch; | 973 | unsigned pch; |