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

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
...@@ -261,6 +261,8 @@ static void __init intcp_init_early(void) ...@@ -261,6 +261,8 @@ static void __init intcp_init_early(void)
#endif #endif
} }
#ifdef CONFIG_OF
static void __init intcp_timer_init_of(void) static void __init intcp_timer_init_of(void)
{ {
struct device_node *node; struct device_node *node;
...@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { ...@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = {
.init = intcp_timer_init_of, .init = intcp_timer_init_of,
}; };
#ifdef CONFIG_OF
static const struct of_device_id fpga_irq_of_match[] __initconst = { static const struct of_device_id fpga_irq_of_match[] __initconst = {
{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, }, { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
{ /* Sentinel */ } { /* Sentinel */ }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment