[GIT PULL] picoxcell cleanups for 3.11
Arnd Bergmann
arnd at arndb.de
Thu Jun 20 10:24:09 EDT 2013
On Wednesday 19 June 2013, Jamie Iles wrote:
> Fixing Arnd's mail address (sorry!).
you did forget to fix up Olof's address though.
> > ----------------------------------------------------------------
> > Jamie Iles (1):
> > picoxcell: remove redundant common.h
> >
> > Maxime Ripard (1):
> > ARM: picoxcell: Remove init_irq declaration in machine description
I got a regression since NR_IRQS_LEGACY is not defined with the headers
removed.
I think we can just remove this line as well, since NR_IRQS_LEGACY is
the default anyway.
Does that work?
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 8267c5d..b13f51b 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -79,7 +79,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd)
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
.map_io = picoxcell_map_io,
- .nr_irqs = NR_IRQS_LEGACY,
.init_machine = picoxcell_init_machine,
.dt_compat = picoxcell_dt_match,
.restart = picoxcell_wdt_restart,
More information about the linux-arm-kernel
mailing list