Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54cae79e authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent bf7058f0

arch/m68k/include/asm/mmu.h

+11 −3
Original line number Diff line number Diff line 
#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

arch/m68k/include/asm/mmu_mm.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __MMU_H

#define __MMU_H



/* Default "unsigned long" context */

typedef unsigned long mm_context_t;



#endif

arch/m68k/include/asm/mmu_no.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
#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 */