summaryrefslogtreecommitdiff
path: root/arch/xtensa/include/asm/cache.h
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-08-14 03:59:15 +0400
committerChris Metcalf <cmetcalf@tilera.com>2010-08-14 03:59:15 +0400
commit7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch)
tree5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/xtensa/include/asm/cache.h
parentba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff)
parent2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff)
downloadlinux-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.tar.xz
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/xtensa/include/asm/cache.h')
-rw-r--r--arch/xtensa/include/asm/cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/cache.h b/arch/xtensa/include/asm/cache.h
index ed8cd3cbd499..d2fd932fdb4d 100644
--- a/arch/xtensa/include/asm/cache.h
+++ b/arch/xtensa/include/asm/cache.h
@@ -29,6 +29,6 @@
# define CACHE_WAY_SIZE ICACHE_WAY_SIZE
#endif
-#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
+#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
#endif /* _XTENSA_CACHE_H */