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

Commit 606333d6 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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



Trivial merge of the mmu and non-mmu version of pgalloc.h

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent c8bd4270

arch/m68k/include/asm/pgalloc.h

+17 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "pgalloc_no.h"

#ifndef M68K_PGALLOC_H

#define M68K_PGALLOC_H



#include <linux/mm.h>

#include <linux/highmem.h>

#include <asm/setup.h>



#ifdef CONFIG_MMU

#include <asm/virtconvert.h>

#ifdef CONFIG_SUN3

#include <asm/sun3_pgalloc.h>

#else

#include "pgalloc_mm.h"

#include <asm/motorola_pgalloc.h>

#endif



extern void m68k_setup_node(int node);

#endif



#endif /* M68K_PGALLOC_H */

arch/m68k/include/asm/pgalloc_mm.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 


#ifndef M68K_PGALLOC_H

#define M68K_PGALLOC_H



#include <linux/mm.h>

#include <linux/highmem.h>

#include <asm/setup.h>

#include <asm/virtconvert.h>





#ifdef CONFIG_SUN3

#include <asm/sun3_pgalloc.h>

#else

#include <asm/motorola_pgalloc.h>

#endif



extern void m68k_setup_node(int node);



#endif /* M68K_PGALLOC_H */

arch/m68k/include/asm/pgalloc_no.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_PGALLOC_H

#define _M68KNOMMU_PGALLOC_H



#include <asm/setup.h>



#endif /* _M68KNOMMU_PGALLOC_H */