From patchwork Wed Nov 23 11:04:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 127264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F30181007D2 for ; Wed, 23 Nov 2011 22:04:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457Ab1KWLEz (ORCPT ); Wed, 23 Nov 2011 06:04:55 -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 Received: by ghrr1 with SMTP id r1so1227259ghr.19 for ; Wed, 23 Nov 2011 03:04:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=zw79u2v6YtS/IerHFC17Tdtg4IGZgEZTgKtrWDjJ3eI=; b=vB6yLX0+q50BvxbDyOuvA0EKFxrHEAVoZ60yl3HZey4CfHZVII09ev7upmjf1OPWiX qnIz3HE1hACKGKt4p799KuqYdOl+PN7JOq/neE5VFXGC/ll+jfMWZsAb+tRZBlI3WkNX dhVvZAUkDGHKKfMCOtd5r5EFwS6PKVnoMn+9s= Received: by 10.236.128.212 with SMTP id f60mr32797641yhi.50.1322046294693; Wed, 23 Nov 2011 03:04:54 -0800 (PST) Received: from [218.172.237.72] (218-172-237-72.dynamic.hinet.net. [218.172.237.72]) by mx.google.com with ESMTPS id i67sm24443521yhm.16.2011.11.23.03.04.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Nov 2011 03:04:53 -0800 (PST) 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 X-Mailer: Evolution 3.2.1- Mime-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@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);