From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants Date: Thu, 27 Oct 2011 21:16:57 +0100 Message-ID: <20111027201657.GP19187@n2100.arm.linux.org.uk> References: <1319561644-6160-1-git-send-email-pdeschrijver@nvidia.com> <1319561644-6160-4-git-send-email-pdeschrijver@nvidia.com> <74CDBE0F657A3D45AFBB94109FB122FF173E1B49B2@HQMAIL01.nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF173E1B49B2@HQMAIL01.nvidia.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Stephen Warren Cc: Peter De Schrijver , "linux-kernel@vger.kernel.org" , "linux-tegra@vger.kernel.org" , Colin Cross , Olof Johansson , "linux-arm-kernel@lists.infradead.org" List-Id: linux-tegra@vger.kernel.org On Thu, Oct 27, 2011 at 01:06:13PM -0700, Stephen Warren wrote: > Peter De Schrijver wrote at Tuesday, October 25, 2011 10:54 AM: > > -static __initdata struct tegra_clk_init_table common_clk_init_table[] = { > > +void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset; > > I'm not sure why you moved that, but I suppose it's fine. Note that Nicolas has a patch set during KS which cleans the arch_reset business out of mach/system.h, and effectively gets rid of arch_reset entirely, so this probably conflicts with those changes.