diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/asm-m68k/pgalloc.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/asm-m68k/pgalloc.h')
| -rw-r--r-- | include/asm-m68k/pgalloc.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-m68k/pgalloc.h b/include/asm-m68k/pgalloc.h deleted file mode 100644 index 4cb1a57ab763..000000000000 --- a/include/asm-m68k/pgalloc.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | |||
| 2 | #ifndef M68K_PGALLOC_H | ||
| 3 | #define M68K_PGALLOC_H | ||
| 4 | |||
| 5 | #include <linux/mm.h> | ||
| 6 | #include <linux/highmem.h> | ||
| 7 | #include <asm/setup.h> | ||
| 8 | #include <asm/virtconvert.h> | ||
| 9 | |||
| 10 | |||
| 11 | #ifdef CONFIG_SUN3 | ||
| 12 | #include <asm/sun3_pgalloc.h> | ||
| 13 | #else | ||
| 14 | #include <asm/motorola_pgalloc.h> | ||
| 15 | #endif | ||
| 16 | |||
| 17 | extern void m68k_setup_node(int node); | ||
| 18 | |||
| 19 | #endif /* M68K_PGALLOC_H */ | ||