]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Ethernut 5: fix build error
authorprabhakar.csengg@gmail.com <prabhakar.csengg@gmail.com>
Thu, 23 Feb 2012 01:53:40 +0000 (01:53 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 29 Feb 2012 00:06:56 +0000 (01:06 +0100)
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>
board/egnite/ethernut5/ethernut5.c

index e42e91e00b45e502768ee5619d1e30fd9bbff55c..fd021a3af8b2efa85e10b830e970d0ca341e8e2b 100644 (file)
@@ -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