From patchwork Mon Feb 6 12:49:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 139727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 138801007D1 for ; Mon, 6 Feb 2012 23:58:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9395028141; Mon, 6 Feb 2012 13:58:09 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yEfdpuYDzBwM; Mon, 6 Feb 2012 13:58:09 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82CC528144; Mon, 6 Feb 2012 13:58:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D0BE428144 for ; Mon, 6 Feb 2012 13:58:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ug3ovSrOwmcT for ; Mon, 6 Feb 2012 13:58:05 +0100 (CET) X-Greylist: delayed 484 seconds by postgrey-1.27 at theia; Mon, 06 Feb 2012 13:58:03 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pw0-f44.google.com (mail-pw0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 082BF28141 for ; Mon, 6 Feb 2012 13:58:03 +0100 (CET) Received: by pbcwz7 with SMTP id wz7so1755549pbc.3 for ; Mon, 06 Feb 2012 04:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=ro59/hq9lVs6ar7m8MNepJ1CPSfSLzyYMwQ4XAd64ic=; b=hHQkS7ZGXdAC6xNl8bcpq8UdDFsZF2H7eCTnLzSJXEkZsZNNxXsqoJyfbIBA0J6TCM 87kgpg484F2X6Mjc/99gzjt5WK+b8e7IlBuaQkz11Lsyu1Ngg9FQxtgym/b09/Fr503X gIVe4GW/+G/uuti7DAkDA4wrvTfThAAHlmKO4= Received: by 10.68.130.1 with SMTP id oa1mr47309523pbb.59.1328532597319; Mon, 06 Feb 2012 04:49:57 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id q8sm15798793pbi.1.2012.02.06.04.49.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Feb 2012 04:49:56 -0800 (PST) From: Prabhakar Lad To: u-boot@lists.denx.de Date: Mon, 6 Feb 2012 18:19:44 +0530 Message-Id: <1328532584-17986-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 Subject: [U-Boot] [PATCH] Ethernut 5: fix build error for board_mmc_getcd() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 Reviewed-by: Thierry Reding --- 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