diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 11:13:54 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 11:13:54 +0200 |
| commit | f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e (patch) | |
| tree | c56a58601b743997051a94532d4cb9b27f9a4635 /arch/arm/include | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | f825c736e75b11adb59ec52a4a1096efddd2ec97 (diff) | |
| download | linux-stable-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.tar.gz linux-stable-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.tar.bz2 linux-stable-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.zip | |
Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
Conflicts:
mm/Kconfig
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/dma-contiguous.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-contiguous.h b/arch/arm/include/asm/dma-contiguous.h index 3ed37b4d93da..e072bb2ba1b1 100644 --- a/arch/arm/include/asm/dma-contiguous.h +++ b/arch/arm/include/asm/dma-contiguous.h @@ -2,7 +2,7 @@ #define ASMARM_DMA_CONTIGUOUS_H #ifdef __KERNEL__ -#ifdef CONFIG_CMA +#ifdef CONFIG_DMA_CMA #include <linux/types.h> #include <asm-generic/dma-contiguous.h> |