diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 21:26:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 21:26:33 +0400 |
| commit | 64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d (patch) | |
| tree | fdd4d4c0cc90ef920cd755b835f0acf1e6ef8fbf /arch/arm/include/asm/dma-contiguous.h | |
| parent | d8cacd3a259bf522ea5e6c4c60eba67ba22f599c (diff) | |
| parent | 10bcdfb8ba24760f715f0a700c3812747eddddf5 (diff) | |
| download | linux-64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d.tar.xz | |
Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA mapping update from Marek Szyprowski:
"This contains an addition of Device Tree support for reserved memory
regions (Contiguous Memory Allocator is one of the drivers for it) and
changes required by the KVM extensions for PowerPC architectue"
* 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: init: add support for reserved memory defined by device tree
drivers: of: add initialization code for dma reserved memory
drivers: of: add function to scan fdt nodes given by path
drivers: dma-contiguous: clean source code and prepare for device tree
Diffstat (limited to 'arch/arm/include/asm/dma-contiguous.h')
| -rw-r--r-- | arch/arm/include/asm/dma-contiguous.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-contiguous.h b/arch/arm/include/asm/dma-contiguous.h index e072bb2ba1b1..4f8e9e5514b1 100644 --- a/arch/arm/include/asm/dma-contiguous.h +++ b/arch/arm/include/asm/dma-contiguous.h @@ -5,7 +5,6 @@ #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); |