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: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
c8bd42707f
commit
606333d64e
|
@ -1,5 +1,19 @@
|
|||
#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 */
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
|
||||
#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 */
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _M68KNOMMU_PGALLOC_H
|
||||
#define _M68KNOMMU_PGALLOC_H
|
||||
|
||||
#include <asm/setup.h>
|
||||
|
||||
#endif /* _M68KNOMMU_PGALLOC_H */
|
Loading…
Reference in a new issue