aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprabhakar.csengg@gmail.com <prabhakar.csengg@gmail.com>2012-02-23 01:53:40 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-29 01:06:56 +0100
commit2271e7c6e8eef883b834fb7d07911848a54fde13 (patch)
treed482a879aa06b1d0dd01f0dbed40e178874b0ea2
parentf1f2c3ca9f837985cc1f4bc3821ac1763430cdcf (diff)
downloadu-boot-linaro-stable-2271e7c6e8eef883b834fb7d07911848a54fde13.tar.gz
Ethernut 5: fix build error
Fix build error for ethernut5 board due to prototype change for function board_mmc_getcd(). ethernut5.c:238: error: conflicting types for 'board_mmc_getcd' u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here make[2]: *** [ethernut5.o] Error 1 Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com> Cc: Tim Schendekehl <tim.schendekehl@egnite.de> Cc: Thierry Reding <thierry.reding@avionic-design.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: egnite GmbH <info@egnite.de>
-rw-r--r--board/egnite/ethernut5/ethernut5.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index e42e91e00..fd021a3af 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -235,10 +235,9 @@ int board_mmc_init(bd_t *bd)
return atmel_mci_init((void *)ATMEL_BASE_MCI);
}
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
{
- *cd = at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN) ? 1 : 0;
- return 0;
+ return !at91_get_pio_value(CONFIG_SYS_MMC_CD_PIN);
}
#endif