diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
| commit | 1e09939bad24df95ddeeeca4fbec64fa94b66def (patch) | |
| tree | 8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/mach-exynos4/dev-audio.c | |
| parent | 4d09a938861ef16248334d57ae250e109b0004ae (diff) | |
| parent | e8de616e39ccea3b8d3cf7e68f16d216f183c4bf (diff) | |
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/mach-exynos4/dev-audio.c')
| -rw-r--r-- | arch/arm/mach-exynos4/dev-audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/dev-audio.c b/arch/arm/mach-exynos4/dev-audio.c index 983069a53239..5a9f9c2e53bf 100644 --- a/arch/arm/mach-exynos4/dev-audio.c +++ b/arch/arm/mach-exynos4/dev-audio.c @@ -21,6 +21,7 @@ #include <mach/map.h> #include <mach/dma.h> #include <mach/irqs.h> +#include <mach/regs-audss.h> static const char *rclksrc[] = { [0] = "busclk", @@ -55,6 +56,7 @@ static struct s3c_audio_pdata i2sv5_pdata = { .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR, .src_clk = rclksrc, + .idma_addr = EXYNOS4_AUDSS_INT_MEM, }, }, }; |