Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'samsung/3.1-rc10-cma-v16' into rpmsg_3.…
…2_rc1 Conflicts: arch/arm/Kconfig arch/arm/include/asm/mach/map.h arch/arm/mm/dma-mapping.c arch/arm/mm/mmu.c arch/arm/plat-s5p/dev-mfc.c
- Loading branch information
Showing
28 changed files
with
1,576 additions
and
286 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#ifndef ASMARM_DMA_CONTIGUOUS_H | ||
#define ASMARM_DMA_CONTIGUOUS_H | ||
|
||
#ifdef __KERNEL__ | ||
|
||
#include <linux/device.h> | ||
#include <linux/dma-contiguous.h> | ||
#include <asm-generic/dma-contiguous.h> | ||
|
||
#ifdef CONFIG_CMA | ||
|
||
void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size); | ||
|
||
#endif | ||
#endif | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.