diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:08 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:58 -0500 |
commit | 5046e385b4426e229a6beb4bce480762af91a6fc (patch) | |
tree | 65b4bff2c913a18840b3c58892853d51b942ac43 /drivers/dma/sa11x0-dma.c | |
parent | a73b59c51ab288d81b515b504790267f594884b8 (diff) | |
parent | b86dc0d8c12bbb9fed3f392c284bdc7114ce00c1 (diff) |
Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
* 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
ARM: dts: correct the dw-mshc timing properties as per binding
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
+ Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
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; |