Skip to content

Commit

Permalink
ARM: integrator_cp: fix build failure
Browse files Browse the repository at this point in the history
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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Oct 9, 2012
1 parent 096947f commit 6e3a78d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-integrator/integrator_cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */ }
Expand Down

0 comments on commit 6e3a78d

Please sign in to comment.