From patchwork Thu Dec 23 18:53:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 76545 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 B817CB70A4 for ; Fri, 24 Dec 2010 05:53:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E3F6F2812A; Thu, 23 Dec 2010 19:53:25 +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 wLuGf05UnsB0; Thu, 23 Dec 2010 19:53:25 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1502628111; Thu, 23 Dec 2010 19:53:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1BB4528111 for ; Thu, 23 Dec 2010 19:53:23 +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 CcA7AhWgp5iL for ; Thu, 23 Dec 2010 19:53:21 +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-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTP id 0815428109 for ; Thu, 23 Dec 2010 19:53:19 +0100 (CET) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3879B180041B; Thu, 23 Dec 2010 19:53:19 +0100 (CET) X-Auth-Info: nNA3wLfUIJ3T5Qm7z5Q/vwlKMewASrh3GA4oRYAPJ24= Received: from diddl.denx.de (ppp-188-174-79-57.dynamic.mnet-online.de [188.174.79.57]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 9D0001C00264; Thu, 23 Dec 2010 19:53:19 +0100 (CET) Received: from gemini.denx.de (unknown [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 7A67E30E60A8; Thu, 23 Dec 2010 19:53:19 +0100 (CET) Received: by gemini.denx.de (Postfix, from userid 500) id 5A205152437; Thu, 23 Dec 2010 19:53:19 +0100 (CET) From: Wolfgang Denk To: u-boot@lists.denx.de Date: Thu, 23 Dec 2010 19:53:16 +0100 Message-Id: <1293130396-6006-1-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.7.3.3 Subject: [U-Boot] [PATCH] libgenwrap.c: fix build error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 Commit 882b7d7 "do_reset: unify duplicate prototypes" introduced build problems like this: libgenwrap.c:85: error: conflicting types for 'do_reset' /home/wd/git/u-boot/work/include/command.h:102: error: previous declaration of 'do_reset' was here Signed-off-by: Wolfgang Denk Cc: Mike Frysinger Signed-off-by: Mike Frysinger --- examples/api/libgenwrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 9733bbc..873cf34 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -81,9 +81,10 @@ void __udelay(unsigned long usec) ub_udelay(usec); } -void do_reset (void) +int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ub_reset(); + return 0; } void *malloc (size_t len)