diff options
author | Alexander Graf <agraf@suse.de> | 2013-07-08 14:16:56 (GMT) |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-07-08 14:16:56 (GMT) |
commit | 20f7462aac0b220c56231a15abec9ab99e897136 (patch) | |
tree | 0a2e033cc1dc203846262b311c3c3c88e1f0f8c2 /arch/arm/include | |
parent | 03617c188f41eeeb4223c919ee7e66e5a114f2c6 (diff) | |
parent | f825c736e75b11adb59ec52a4a1096efddd2ec97 (diff) | |
download | linux-20f7462aac0b220c56231a15abec9ab99e897136.tar.xz |
Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next
Add prerequisite patch for CMA RMA allocation patches
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 3ed37b4..e072bb2 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> |