diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-07 10:42:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-09 08:20:03 -0700 |
| commit | 6e3a78d9474f54c0b2b5293a561548106243eeaf (patch) | |
| tree | 68a0f8332e19d91466f787dd92ece65123e207c7 /arch | |
| parent | 096947fdab96fd97df47b10b8547382290ef9fcd (diff) | |
| download | linux-6e3a78d9474f54c0b2b5293a561548106243eeaf.tar.gz linux-6e3a78d9474f54c0b2b5293a561548106243eeaf.tar.bz2 linux-6e3a78d9474f54c0b2b5293a561548106243eeaf.zip | |
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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 6870a1fbcd78..5b08e8e4cc83 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -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 */ } |