diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-mips/mach-ip32/kmalloc.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/mach-ip32/kmalloc.h')
| -rw-r--r-- | include/asm-mips/mach-ip32/kmalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/include/asm-mips/mach-ip32/kmalloc.h index f6198a21fba1..b1e0be60f720 100644 --- a/include/asm-mips/mach-ip32/kmalloc.h +++ b/include/asm-mips/mach-ip32/kmalloc.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __ASM_MACH_IP32_KMALLOC_H | 2 | #define __ASM_MACH_IP32_KMALLOC_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000) | 5 | #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000) |
| 6 | #define ARCH_KMALLOC_MINALIGN 32 | 6 | #define ARCH_KMALLOC_MINALIGN 32 |
| 7 | #else | 7 | #else |
| 8 | #define ARCH_KMALLOC_MINALIGN 128 | 8 | #define ARCH_KMALLOC_MINALIGN 128 |