From patchwork Mon Jan 14 20:13:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 211883 X-Patchwork-Delegate: trini@ti.com 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 975FF2C00A6 for ; Tue, 15 Jan 2013 07:13:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CFA9E4A0A6; Mon, 14 Jan 2013 21:13:41 +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 8J9xRJeJxeHN; Mon, 14 Jan 2013 21:13:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 314BF4A0AB; Mon, 14 Jan 2013 21:13:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B45984A0AB for ; Mon, 14 Jan 2013 21:13:35 +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 VPYKYtVbaFIk for ; Mon, 14 Jan 2013 21:13:32 +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-gg0-f178.google.com (mail-gg0-f178.google.com [209.85.161.178]) by theia.denx.de (Postfix) with ESMTPS id 929D04A0A6 for ; Mon, 14 Jan 2013 21:13:31 +0100 (CET) Received: by mail-gg0-f178.google.com with SMTP id u1so730143ggl.9 for ; Mon, 14 Jan 2013 12:13:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=RcVoRmzFs+YK3f6+6P/M3oexg/faOTOfIe88pAVN3dI=; b=mlgol7VggOtxVLPsUyxictN2E+phieQLlFqFrdtNz4JGwY80HSKcfr9fWm2l0chpTe 1PqOcisv4JwUUG3cKnps4uzNg0Z2zJV3/qYpigxYCoMbJIjsY24OO49LOBncnea9sMUR zT4k0vAyNoSb8wWnmrI/PmY9LRjkF9CwkKKHyFuPR36brtMqB9xFU6Fto6X2+fmpZhI+ FdQY62PM9RNMLprNtTs0m7hR3p/pMzS6fNqFYR8NiY2mmRk6SWvdapG73acjTWb7/+va 4fNeefs5oeFUhE8xcHdXvclpno51/nZ6awsvZ6plk+QhX5jq0kN8nWQ+2kk4dGnaVzee gqKQ== X-Received: by 10.236.126.135 with SMTP id b7mr37492212yhi.18.1358194409680; Mon, 14 Jan 2013 12:13:29 -0800 (PST) Received: from localhost.localdomain (cpe-065-184-245-044.ec.res.rr.com. [65.184.245.44]) by mx.google.com with ESMTPS id a15sm12122939ank.22.2013.01.14.12.13.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jan 2013 12:13:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 14 Jan 2013 13:13:29 -0700 Message-Id: <1358194409-5903-1-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20130114175839.646a9624@lilith> References: <20130114175839.646a9624@lilith> Subject: [U-Boot] [PATCH] watchdog.h: Move hw_watchdog_init prototype to end, guard 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 In commit abbab70 we added a prototype for hw_watchdog_init, in a Freescale i.MX watchdog driver. We did not however guard it with an __ASSEMBLY__ check and broke some platforms. Move this to the end of the file with other prototypes and guard it. Signed-off-by: Tom Rini --- include/watchdog.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/watchdog.h b/include/watchdog.h index 328a30b..8c92a0b 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -35,7 +35,6 @@ * Hardware watchdog */ #ifdef CONFIG_HW_WATCHDOG - void hw_watchdog_init(void); #if defined(__ASSEMBLY__) #define WATCHDOG_RESET bl hw_watchdog_reset #else @@ -91,4 +90,8 @@ void reset_4xx_watchdog(void); #endif +/* Freescale i.MX */ +#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__) + void hw_watchdog_init(void); +#endif #endif /* _WATCHDOG_H_ */