diff options
| author | Pete Popov <ppopov@embeddedalley.com> | 2005-07-14 02:17:05 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 20:31:50 +0200 |
| commit | f10fae02403fb8af141b0a440074a944ccd63504 (patch) | |
| tree | a401c82cc2692955faa284111bef23ece0980147 | |
| parent | Removed __ilog2 since it's no longer needed and conflicts with the (diff) | |
| download | linux-f10fae02403fb8af141b0a440074a944ccd63504.tar.xz linux-f10fae02403fb8af141b0a440074a944ccd63504.zip | |
Fix the fixup_bigphys_addr compile problem.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | include/asm-mips/mach-au1x00/ioremap.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/pgtable.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-mips/mach-au1x00/ioremap.h b/include/asm-mips/mach-au1x00/ioremap.h index f1c8c1087115..d3ec6274575a 100644 --- a/include/asm-mips/mach-au1x00/ioremap.h +++ b/include/asm-mips/mach-au1x00/ioremap.h @@ -12,7 +12,9 @@ #include <linux/config.h> #include <linux/types.h> -#ifndef CONFIG_64BIT_PHYS_ADDR +#ifdef CONFIG_64BIT_PHYS_ADDR +extern phys_t __fixup_bigphys_addr(phys_t, phys_t); +#else static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size) { return phys_addr; diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index 9f75baf11e25..1e8ae2723be4 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -16,6 +16,7 @@ #include <asm/pgtable-64.h> #endif +#include <asm/io.h> #include <asm/pgtable-bits.h> #define PAGE_NONE __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT) @@ -362,7 +363,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, #endif #ifdef CONFIG_64BIT_PHYS_ADDR -extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); static inline int io_remap_pfn_range(struct vm_area_struct *vma, |