From patchwork Thu Feb 23 11:53:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 142594 X-Patchwork-Delegate: albert.aribaud@free.fr 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 B73D8B6EEC for ; Thu, 23 Feb 2012 22:53:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6200E28087; Thu, 23 Feb 2012 12:53:55 +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 CqhnULhGSn4D; Thu, 23 Feb 2012 12:53:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 17F6A2807B; Thu, 23 Feb 2012 12:53:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 229AE2807B for ; Thu, 23 Feb 2012 12:53:53 +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 a4RWN29XsVGB for ; Thu, 23 Feb 2012 12:53:52 +0100 (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 1C67728078 for ; Thu, 23 Feb 2012 12:53:50 +0100 (CET) Received: by pbcwz7 with SMTP id wz7so1218681pbc.3 for ; Thu, 23 Feb 2012 03:53:48 -0800 (PST) Received-SPF: pass (google.com: domain of prabhakar.csengg@gmail.com designates 10.68.224.133 as permitted sender) client-ip=10.68.224.133; Authentication-Results: mr.google.com; spf=pass (google.com: domain of prabhakar.csengg@gmail.com designates 10.68.224.133 as permitted sender) smtp.mail=prabhakar.csengg@gmail.com; dkim=pass header.i=prabhakar.csengg@gmail.com Received: from mr.google.com ([10.68.224.133]) by 10.68.224.133 with SMTP id rc5mr2880391pbc.144.1329998028925 (num_hops = 1); Thu, 23 Feb 2012 03:53:48 -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=g79kZKYH3D/WlhbOgcOu4VKNWx0dXhc5iD/Eg1eyrpE=; b=jb8IRiiyKkWKBwid3mXvibD84fV5fV/fZpnUgq4SAQmly+9+R3cLSrLuIpPLCqWtLU RS6rWyBYBmTZbTO5teE+lrl/r56Rz2lHQBcbPVTLB7QKAIXW9MEfYthpYMsebzRqyTf3 wcJFOfOy9PejiNnzhgdDZd1F0KpENrDu6mrxA= Received: by 10.68.224.133 with SMTP id rc5mr2436961pbc.144.1329998028767; Thu, 23 Feb 2012 03:53:48 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id q1sm1294310pbq.68.2012.02.23.03.53.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Feb 2012 03:53:48 -0800 (PST) From: Prabhakar Lad To: u-boot@lists.denx.de Date: Thu, 23 Feb 2012 17:23:40 +0530 Message-Id: <1329998020-2338-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 Cc: egnite GmbH Subject: [U-Boot] [PATCH v2] Ethernut 5: fix build error 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 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 Cc: Tim Schendekehl Cc: Thierry Reding Cc: Albert ARIBAUD Cc: egnite GmbH --- Changes for v2: Description change. 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