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 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
mach-tx49xx
/
kmalloc.h
diff --git
a/arch/mips/include/asm/mach-tx49xx/kmalloc.h
b/arch/mips/include/asm/mach-tx49xx/kmalloc.h
index
b74caf6
..
ff9a8b8
100644
(file)
--- a/
arch/mips/include/asm/mach-tx49xx/kmalloc.h
+++ b/
arch/mips/include/asm/mach-tx49xx/kmalloc.h
@@
-1,6
+1,6
@@
#ifndef __ASM_MACH_TX49XX_KMALLOC_H
#define __ASM_MACH_TX49XX_KMALLOC_H
-#define ARCH_
KMALLOC_MINALIGN
L1_CACHE_BYTES
+#define ARCH_
DMA_MINALIGN
L1_CACHE_BYTES
#endif /* __ASM_MACH_TX49XX_KMALLOC_H */