diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
| commit | fafd883f671dfc1c2f62009179920f27abc784a1 (patch) | |
| tree | 0eccb0baf343cad79a54e352598921db9ca17620 /include/linux/device.h | |
| parent | 92519bbc8af612975410def52bd462ca9af85cdb (diff) | |
| parent | d8b11a0cbd1c66ce283eb9dabe0498dfa6483f32 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index f46646e49235..2a9d6ed59579 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -737,7 +737,7 @@ struct device { struct dma_coherent_mem *dma_mem; /* internal for coherent mem override */ -#ifdef CONFIG_CMA +#ifdef CONFIG_DMA_CMA struct cma *cma_area; /* contiguous memory area for dma allocations */ #endif |