diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-02-05 01:01:00 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 06:17:43 +0100 |
| commit | 606333d64e06db9ae14b5a025380bc5954b1a6c4 (patch) | |
| tree | a89dbd06dbb41466322d5e3c4433e781a05fbb35 /arch/m68k | |
| parent | m68knommu: mv definition of check_pgt_cache() (diff) | |
| download | linux-606333d64e06db9ae14b5a025380bc5954b1a6c4.tar.xz linux-606333d64e06db9ae14b5a025380bc5954b1a6c4.zip | |
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>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/pgalloc.h | 20 | ||||
| -rw-r--r-- | arch/m68k/include/asm/pgalloc_mm.h | 19 | ||||
| -rw-r--r-- | arch/m68k/include/asm/pgalloc_no.h | 6 |
3 files changed, 17 insertions, 28 deletions
diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h index 059cb73e78fc..c294aad8a900 100644 --- a/arch/m68k/include/asm/pgalloc.h +++ b/arch/m68k/include/asm/pgalloc.h @@ -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 */ diff --git a/arch/m68k/include/asm/pgalloc_mm.h b/arch/m68k/include/asm/pgalloc_mm.h deleted file mode 100644 index 4cb1a57ab763..000000000000 --- a/arch/m68k/include/asm/pgalloc_mm.h +++ /dev/null @@ -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 */ diff --git a/arch/m68k/include/asm/pgalloc_no.h b/arch/m68k/include/asm/pgalloc_no.h deleted file mode 100644 index a79ee0e163dc..000000000000 --- a/arch/m68k/include/asm/pgalloc_no.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_PGALLOC_H -#define _M68KNOMMU_PGALLOC_H - -#include <asm/setup.h> - -#endif /* _M68KNOMMU_PGALLOC_H */ |