diff options
| -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) | |||
| 261 | #endif | 261 | #endif |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | #ifdef CONFIG_OF | ||
| 265 | |||
| 264 | static void __init intcp_timer_init_of(void) | 266 | static void __init intcp_timer_init_of(void) |
| 265 | { | 267 | { |
| 266 | struct device_node *node; | 268 | struct device_node *node; |
| @@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { | |||
| 297 | .init = intcp_timer_init_of, | 299 | .init = intcp_timer_init_of, |
| 298 | }; | 300 | }; |
| 299 | 301 | ||
| 300 | #ifdef CONFIG_OF | ||
| 301 | |||
| 302 | static const struct of_device_id fpga_irq_of_match[] __initconst = { | 302 | static const struct of_device_id fpga_irq_of_match[] __initconst = { |
| 303 | { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, }, | 303 | { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, }, |
| 304 | { /* Sentinel */ } | 304 | { /* Sentinel */ } |
