[PATCH-next] ARM: Fix compilation error.

Marek Belisko marek.belisko at open-nandra.com
Wed Aug 3 17:55:57 EDT 2011


Fix following error:
arch/arm/include/asm/mmu.h:29:19: error: conflicting types for 'mmu_init'
arch/arm/include/asm/mmu.h:10:6: note: previous declaration of 'mmu_init' was here
arch/arm/include/asm/mmu.h: In function 'mmu_init':
arch/arm/include/asm/mmu.h:31:10: error: 'EINVAL' undeclared (first use in this function)
arch/arm/include/asm/mmu.h:31:10: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Marek Belisko <marek.belisko at open-nandra.com>
---
 arch/arm/include/asm/mmu.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
index 9ebc2cd..a121165 100644
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@ -26,9 +26,9 @@ unsigned long virt_to_phys(void *virt);
 void *phys_to_virt(unsigned long phys);
 
 #else
-static inline int mmu_init(void)
+inline void mmu_init(void)
 {
-	return -EINVAL;
+
 }
 
 static inline void *dma_alloc_coherent(size_t size)
-- 
1.7.4.1




More information about the barebox mailing list