mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marek Belisko <marek.belisko@open-nandra.com>
To: barebox@lists.infradead.org
Cc: Marek Belisko <marek.belisko@open-nandra.com>
Subject: [PATCH-next] ARM: Fix compilation error.
Date: Wed,  3 Aug 2011 23:55:57 +0200	[thread overview]
Message-ID: <1312408558-21782-1-git-send-email-marek.belisko@open-nandra.com> (raw)

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

             reply	other threads:[~2011-08-03 21:56 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-03 21:55 Marek Belisko [this message]
2011-08-04  0:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-08-04  7:09   ` Belisko Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1312408558-21782-1-git-send-email-marek.belisko@open-nandra.com \
    --to=marek.belisko@open-nandra.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox