Messages in this thread | | | Date | Fri, 28 Oct 2011 17:19:34 +0100 | From | Will Deacon <> | Subject | Re: [PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants |
| |
On Thu, Oct 27, 2011 at 09:16:57PM +0100, Russell King - ARM Linux wrote: > 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.
I've spammed the ARM list with this patch series now, so the state of the conflicts should be evident.
Will
| |