projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
include
/
asm
/
dma-contiguous.h
diff --git
a/arch/arm/include/asm/dma-contiguous.h
b/arch/arm/include/asm/dma-contiguous.h
index 3ed37b4d93dade5c688410eae876ccb53364ef72..4f8e9e5514b14486c8b9a6fdcc652af966bceeda 100644
(file)
--- a/
arch/arm/include/asm/dma-contiguous.h
+++ b/
arch/arm/include/asm/dma-contiguous.h
@@
-2,10
+2,9
@@
#define ASMARM_DMA_CONTIGUOUS_H
#ifdef __KERNEL__
-#ifdef CONFIG_CMA
+#ifdef CONFIG_
DMA_
CMA
#include <linux/types.h>
-#include <asm-generic/dma-contiguous.h>
void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);