diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 05:13:54 -0400 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 05:13:54 -0400 |
| commit | f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e (patch) | |
| tree | c56a58601b743997051a94532d4cb9b27f9a4635 /include/linux/dma-contiguous.h | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | f825c736e75b11adb59ec52a4a1096efddd2ec97 (diff) | |
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 'include/linux/dma-contiguous.h')
| -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 |