Fix the fixup_bigphys_addr compile problem.
authorPete Popov <ppopov@embeddedalley.com>
Thu, 14 Jul 2005 00:17:05 +0000 (00:17 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 29 Oct 2005 18:31:50 +0000 (19:31 +0100)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
include/asm-mips/mach-au1x00/ioremap.h
include/asm-mips/pgtable.h

index f1c8c108711564fde6319c6bcdbfccb05d3916d4..d3ec6274575a74d01492de292b484011a6033402 100644 (file)
@@ -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;
index 9f75baf11e25276a12e683d70ea58cd9d6c773a3..1e8ae2723be439fa61a1a68cebce90d3994a9ff2 100644 (file)
@@ -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,