mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH-next] ARM: Fix compilation error.
@ 2011-08-03 21:55 Marek Belisko
  2011-08-04  0:38 ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 3+ messages in thread
From: Marek Belisko @ 2011-08-03 21:55 UTC (permalink / raw)
  To: barebox; +Cc: Marek Belisko

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@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-08-04  7:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-03 21:55 [PATCH-next] ARM: Fix compilation error Marek Belisko
2011-08-04  0:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-08-04  7:09   ` Belisko Marek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox