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 /include | |
| parent | Linux 3.11-rc1 (diff) | |
| parent | mm/cma: Move dma contiguous changes into a seperate config (diff) | |
| download | linux-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.tar.xz linux-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 '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 |