diff options
| author | Alexander Graf <agraf@suse.de> | 2013-07-08 16:16:56 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-07-08 16:16:56 +0200 |
| commit | 20f7462aac0b220c56231a15abec9ab99e897136 (patch) | |
| tree | 0a2e033cc1dc203846262b311c3c3c88e1f0f8c2 /include | |
| parent | KVM: VMX: mark unusable segment as nonpresent (diff) | |
| parent | mm/cma: Move dma contiguous changes into a seperate config (diff) | |
| download | linux-20f7462aac0b220c56231a15abec9ab99e897136.tar.xz linux-20f7462aac0b220c56231a15abec9ab99e897136.zip | |
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 'include')
| -rw-r--r-- | include/linux/dma-contiguous.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 01b5c84be828..00141d3325fe 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h @@ -57,7 +57,7 @@ struct cma; struct page; struct device; -#ifdef CONFIG_CMA +#ifdef CONFIG_DMA_CMA /* * There is always at least global CMA area and a few optional device |