diff options
author | Franck Bui-Huu <fbuihuu@gmail.com> | 2007-06-04 17:46:34 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 17:32:57 +0100 |
commit | 41b0483ee54d89f9ad068ceae3c91cdc7594d050 (patch) | |
tree | 7e7afcbfc49460d33205c3f23944cb3529d77f1c | |
parent | db38501511a7513ec4f0ae9922d847c135cf3c78 (diff) | |
download | linux-41b0483ee54d89f9ad068ceae3c91cdc7594d050.tar.bz2 |
[MIPS] Move PHY_OFFSET definition in spaces.h
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | include/asm-mips/mach-generic/spaces.h | 7 | ||||
-rw-r--r-- | include/asm-mips/page.h | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h index f0571b651940..c9fa4b14968d 100644 --- a/include/asm-mips/mach-generic/spaces.h +++ b/include/asm-mips/mach-generic/spaces.h @@ -12,6 +12,13 @@ #include <linux/const.h> +/* + * This gives the physical RAM offset. + */ +#ifndef PHYS_OFFSET +#define PHYS_OFFSET _AC(0, UL) +#endif + #ifdef CONFIG_32BIT #define CAC_BASE _AC(0x80000000, UL) diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index 5c3239dad0f2..c56c6a85908d 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -34,12 +34,8 @@ #ifndef __ASSEMBLY__ -/* - * This gives the physical RAM offset. - */ -#ifndef PHYS_OFFSET -#define PHYS_OFFSET 0UL -#endif +#include <linux/pfn.h> +#include <linux/io.h> /* * It's normally defined only for FLATMEM config but it's @@ -48,9 +44,6 @@ */ #define ARCH_PFN_OFFSET PFN_UP(PHYS_OFFSET) -#include <linux/pfn.h> -#include <asm/io.h> - extern void clear_page(void * page); extern void copy_page(void * to, void * from); |