diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-06 20:31:33 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-06 20:31:33 +0400 |
| commit | ab74a91429ed3e10b27632e22ff681be90d9cd0d (patch) | |
| tree | 269f647823dc06d70054bfe0fc51418c318c4802 /arch/arm/mach-s3c2440/dma.c | |
| parent | ca43784daa7a400407d851799ac69d3de2b2ab4e (diff) | |
| parent | 3e8ad5610c07f88bdecf94468929c86631be476f (diff) | |
| download | linux-ab74a91429ed3e10b27632e22ff681be90d9cd0d.tar.xz | |
Merge branch 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board
ARM: EXYNOS: Correct framebuffer window size on Nuri board
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type"
ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210
ARM: EXYNOS: Remove build warning without enabling PM
ARM: SAMSUNG: Fix platform data setup for I2C adapter 0
ARM: EXYNOS: fix non-SMP builds for EXYNOS4
ARM: S3C6410: Use device names for both I2C clocks
ARM: S3C64XX: Make s3c64xx_init_uarts() static
Diffstat (limited to 'arch/arm/mach-s3c2440/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index 15b1ddf8f626..5f0a0c8ef84f 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c @@ -174,7 +174,8 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = { }, }; -static int __init s3c2440_dma_add(struct device *dev) +static int __init s3c2440_dma_add(struct device *dev, + struct subsys_interface *sif) { s3c2410_dma_init(); s3c24xx_dma_order_set(&s3c2440_dma_order); |