diff options
| author | Alexander Graf <agraf@suse.de> | 2013-07-08 10:16:56 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-07-08 10:16:56 -0400 |
| commit | 20f7462aac0b220c56231a15abec9ab99e897136 (patch) | |
| tree | 0a2e033cc1dc203846262b311c3c3c88e1f0f8c2 /include/linux | |
| parent | 03617c188f41eeeb4223c919ee7e66e5a114f2c6 (diff) | |
| parent | f825c736e75b11adb59ec52a4a1096efddd2ec97 (diff) | |
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/linux')
| -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; | |||
| 57 | struct page; | 57 | struct page; |
| 58 | struct device; | 58 | struct device; |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_CMA | 60 | #ifdef CONFIG_DMA_CMA |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * There is always at least global CMA area and a few optional device | 63 | * There is always at least global CMA area and a few optional device |