Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3a78d9 authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: integrator_cp: fix build failure 



arch/arm/mach-integrator/integrator_cp.c:272:32: error: 'of_aliases'
undeclared (first use in this function)

Move the OF-only timer init under #ifdef CONFIG_OF, just like
integrator_ap has it.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 096947fd

arch/arm/mach-integrator/integrator_cp.c

+2 −2
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ static void __init intcp_init_early(void) 
#endif

}



#ifdef CONFIG_OF



static void __init intcp_timer_init_of(void)

{

	struct device_node *node;
@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { 
	.init		= intcp_timer_init_of,

};



#ifdef CONFIG_OF



static const struct of_device_id fpga_irq_of_match[] __initconst = {

	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },

	{ /* Sentinel */ }