From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Date: Mon, 6 Feb 2012 14:38:13 +0100 Subject: [U-Boot] [PATCH] Ethernut 5: fix build error for board_mmc_getcd() In-Reply-To: <1328532584-17986-1-git-send-email-prabhakar.csengg@gmail.com> References: <1328532584-17986-1-git-send-email-prabhakar.csengg@gmail.com> Message-ID: <20120206133812.GA7321@avionic-0098.adnet.avionic-design.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de * Prabhakar Lad wrote: > Fix build error for ethernut5 and mx6qarm2 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 > --- > board/egnite/ethernut5/ethernut5.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c > index e42e91e..fd021a3 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 Reviewed-by: Thierry Reding -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: