projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index 009863beec555f72410cd3c893855ac7f1c4f7b4..55a4e266a0a7078dc8f5390647b51019b8c78962 100644
(file)
--- a/
arch/arm/include/asm/dma-mapping.h
+++ b/
arch/arm/include/asm/dma-mapping.h
@@
-16,7
+16,7
@@
enum dma_data_direction {
static void *dma_alloc_coherent(size_t len, unsigned long *handle)
{
- *handle = (unsigned long)m
alloc(
len);
+ *handle = (unsigned long)m
emalign(ARCH_DMA_MINALIGN,
len);
return (void *)*handle;
}