m68k: merge the mmu and non-mmu versions of mmu.h

Trivial merge of the contents of mmu and non-mmu versions of mmu.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Greg Ungerer 2009-01-29 15:57:30 +10:00
parent bf7058f04a
commit 54cae79e52
3 changed files with 11 additions and 20 deletions

View File

@ -1,5 +1,13 @@
#ifdef __uClinux__
#include "mmu_no.h"
#ifndef __MMU_H
#define __MMU_H
#ifdef CONFIG_MMU
/* Default "unsigned long" context */
typedef unsigned long mm_context_t;
#else
#include "mmu_mm.h"
typedef struct {
unsigned long end_brk;
} mm_context_t;
#endif
#endif

View File

@ -1,7 +0,0 @@
#ifndef __MMU_H
#define __MMU_H
/* Default "unsigned long" context */
typedef unsigned long mm_context_t;
#endif

View File

@ -1,10 +0,0 @@
#ifndef __M68KNOMMU_MMU_H
#define __M68KNOMMU_MMU_H
/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
typedef struct {
unsigned long end_brk;
} mm_context_t;
#endif /* __M68KNOMMU_MMU_H */