From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754575Ab1KWLE4 (ORCPT ); Wed, 23 Nov 2011 06:04:56 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:48560 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196Ab1KWLEz (ORCPT ); Wed, 23 Nov 2011 06:04:55 -0500 Message-ID: <1322046284.27165.1.camel@phoenix> Subject: [PATCH] ARM: tegra: remove declaration of tegra_assert_system_reset in board.h From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Colin Cross , Olof Johansson , Stephen Warren , Russell King , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Wed, 23 Nov 2011 19:04:44 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit b2f745 "ARM: restart: tegra: use new restart hook" changed tegra_assert_system_reset to be static but forgot to remove the declaration in arch/arm/mach-tegra/board.h. Remove the declaration of tegra_assert_system_reset in arch/arm/mach-tegra/board.h to fix below build error: CC arch/arm/mach-tegra/common.o arch/arm/mach-tegra/common.c:34: error: static declaration of 'tegra_assert_system_reset' follows non-static declaration arch/arm/mach-tegra/board.h:26: note: previous declaration of 'tegra_assert_system_reset' was here make[1]: *** [arch/arm/mach-tegra/common.o] Error 1 make: *** [arch/arm/mach-tegra] Error 2 Signed-off-by: Axel Lin --- I got the build error on linux-next tree. This patch is against linux-next 20111123. arch/arm/mach-tegra/board.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h index 1d14df7..f159577 100644 --- a/arch/arm/mach-tegra/board.h +++ b/arch/arm/mach-tegra/board.h @@ -23,8 +23,6 @@ #include -void tegra_assert_system_reset(char mode, const char *cmd); - void __init tegra_init_early(void); void __init tegra_map_common_io(void); void __init tegra_init_irq(void); -- 1.7.5.4