diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /arch/microblaze/include/asm/mmu.h | |
| parent | 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff) | |
| parent | dc53fffc105f68cb08ca872acd51550e89aa2e67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'arch/microblaze/include/asm/mmu.h')
| -rw-r--r-- | arch/microblaze/include/asm/mmu.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/microblaze/include/asm/mmu.h b/arch/microblaze/include/asm/mmu.h index 66cad6a99d77..8d6a654ceffb 100644 --- a/arch/microblaze/include/asm/mmu.h +++ b/arch/microblaze/include/asm/mmu.h | |||
| @@ -12,12 +12,7 @@ | |||
| 12 | #define _ASM_MICROBLAZE_MMU_H | 12 | #define _ASM_MICROBLAZE_MMU_H |
| 13 | 13 | ||
| 14 | # ifndef CONFIG_MMU | 14 | # ifndef CONFIG_MMU |
| 15 | # ifndef __ASSEMBLY__ | 15 | # include <asm-generic/mmu.h> |
| 16 | typedef struct { | ||
| 17 | struct vm_list_struct *vmlist; | ||
| 18 | unsigned long end_brk; | ||
| 19 | } mm_context_t; | ||
| 20 | # endif /* __ASSEMBLY__ */ | ||
| 21 | # else /* CONFIG_MMU */ | 16 | # else /* CONFIG_MMU */ |
| 22 | # ifdef __KERNEL__ | 17 | # ifdef __KERNEL__ |
| 23 | # ifndef __ASSEMBLY__ | 18 | # ifndef __ASSEMBLY__ |