git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
page.h
diff --git
a/arch/sh/include/asm/page.h
b/arch/sh/include/asm/page.h
index
fb703d1
..
c4e0b3d
100644
(file)
--- a/
arch/sh/include/asm/page.h
+++ b/
arch/sh/include/asm/page.h
@@
-180,7
+180,7
@@
typedef struct page *pgtable_t;
* Some drivers need to perform DMA into kmalloc'ed buffers
* and so we have to increase the kmalloc minalign for this.
*/
-#define ARCH_
KMALLOC_MINALIGN
L1_CACHE_BYTES
+#define ARCH_
DMA_MINALIGN
L1_CACHE_BYTES
#ifdef CONFIG_SUPERH64
/*