git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
cache.h
diff --git
a/arch/arm/include/asm/cache.h
b/arch/arm/include/asm/cache.h
index 66c160b8547fdda1bc4e3f17f14c3229f1e0d940..9d6122096fbec40ad41ab473c189722816225399 100644
(file)
--- a/
arch/arm/include/asm/cache.h
+++ b/
arch/arm/include/asm/cache.h
@@
-14,7
+14,7
@@
* cache before the transfer is done, causing old data to be seen by
* the CPU.
*/
-#define ARCH_
KMALLOC_MINALIGN
L1_CACHE_BYTES
+#define ARCH_
DMA_MINALIGN
L1_CACHE_BYTES
/*
* With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.