diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:50 -0400 |
| commit | 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a (patch) | |
| tree | e2767b77e5413473a3bba302237f4669a203f183 /include/asm-mips/mach-ip32/kmalloc.h | |
| parent | 74e91604b2452c15bbe72d77b37cf47ed0310d13 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/spinlocks
Done to prevent this failure of an Octopus merge:
Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed
Diffstat (limited to 'include/asm-mips/mach-ip32/kmalloc.h')
| -rw-r--r-- | include/asm-mips/mach-ip32/kmalloc.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/include/asm-mips/mach-ip32/kmalloc.h deleted file mode 100644 index b1e0be60f720..000000000000 --- a/include/asm-mips/mach-ip32/kmalloc.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | #ifndef __ASM_MACH_IP32_KMALLOC_H | ||
| 2 | #define __ASM_MACH_IP32_KMALLOC_H | ||
| 3 | |||
| 4 | |||
| 5 | #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000) | ||
| 6 | #define ARCH_KMALLOC_MINALIGN 32 | ||
| 7 | #else | ||
| 8 | #define ARCH_KMALLOC_MINALIGN 128 | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #endif /* __ASM_MACH_IP32_KMALLOC_H */ | ||