diff options
author | Pete Popov <ppopov@embeddedalley.com> | 2005-07-13 20:17:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:31:50 -0400 |
commit | f10fae02403fb8af141b0a440074a944ccd63504 (patch) | |
tree | a401c82cc2692955faa284111bef23ece0980147 /include | |
parent | 10f6567e63a0ba9b473da9ea60452ffdb07ced02 (diff) |
Fix the fixup_bigphys_addr compile problem.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
-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 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | 14 | ||
15 | #ifndef CONFIG_64BIT_PHYS_ADDR | 15 | #ifdef CONFIG_64BIT_PHYS_ADDR |
16 | extern phys_t __fixup_bigphys_addr(phys_t, phys_t); | ||
17 | #else | ||
16 | static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size) | 18 | static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size) |
17 | { | 19 | { |
18 | return phys_addr; | 20 | 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 @@ | |||
16 | #include <asm/pgtable-64.h> | 16 | #include <asm/pgtable-64.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #include <asm/io.h> | ||
19 | #include <asm/pgtable-bits.h> | 20 | #include <asm/pgtable-bits.h> |
20 | 21 | ||
21 | #define PAGE_NONE __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT) | 22 | #define PAGE_NONE __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT) |
@@ -362,7 +363,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, | |||
362 | #endif | 363 | #endif |
363 | 364 | ||
364 | #ifdef CONFIG_64BIT_PHYS_ADDR | 365 | #ifdef CONFIG_64BIT_PHYS_ADDR |
365 | extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); | ||
366 | extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); | 366 | extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); |
367 | 367 | ||
368 | static inline int io_remap_pfn_range(struct vm_area_struct *vma, | 368 | static inline int io_remap_pfn_range(struct vm_area_struct *vma, |