diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-05 21:49:45 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-05 21:49:45 +0400 |
| commit | 00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2 (patch) | |
| tree | 706e9db7d0a45fd75d03d72ab568d6b7d44287b7 /arch/arm/mach-exynos/dma.c | |
| parent | 57b501bdceca328bb500d87587b440194ef15e8d (diff) | |
| parent | f011fd164801cd8dd151268ae7adbadef0e3e301 (diff) | |
| download | linux-00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2.tar.xz | |
Merge branch 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix compiler warning in dma.c file
ARM: EXYNOS: fix ISO C90 warning
ARM: EXYNOS: use chip_id reg in uncompress to select uart base phys
ARM: EXYNOS: fix CONFIG_DEBUG_LL
ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
Diffstat (limited to 'arch/arm/mach-exynos/dma.c')
| -rw-r--r-- | arch/arm/mach-exynos/dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c index 3983abee4264..69aaa4503205 100644 --- a/arch/arm/mach-exynos/dma.c +++ b/arch/arm/mach-exynos/dma.c @@ -35,8 +35,6 @@ #include <mach/irqs.h> #include <mach/dma.h> -static u64 dma_dmamask = DMA_BIT_MASK(32); - static u8 exynos4210_pdma0_peri[] = { DMACH_PCM0_RX, DMACH_PCM0_TX, |