From 267a64162a6df6b2d4983f7ad644f41e404565a5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 23 Sep 2012 22:36:35 +0000 Subject: [PATCH] --- yaml --- r: 333307 b: refs/heads/master c: b3796d92086ecea4c4825fa232da60b6d6f354af h: refs/heads/master i: 333305: 6593361f343edab707996940938401a17a17a261 333303: 5970963a29e21d60f968ef94f00261d047fb5225 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_cp.c | 4 ++-- trunk/arch/arm/mach-shmobile/include/mach/common.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4976bd929899..156bbe989e59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e3a78d9474f54c0b2b5293a561548106243eeaf +refs/heads/master: b3796d92086ecea4c4825fa232da60b6d6f354af diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index 5b08e8e4cc83..6870a1fbcd78 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -261,8 +261,6 @@ static void __init intcp_init_early(void) #endif } -#ifdef CONFIG_OF - static void __init intcp_timer_init_of(void) { struct device_node *node; @@ -299,6 +297,8 @@ 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 */ } diff --git a/trunk/arch/arm/mach-shmobile/include/mach/common.h b/trunk/arch/arm/mach-shmobile/include/mach/common.h index ed77ab8c9143..d47e215aca87 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/common.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/common.h @@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; } extern void shmobile_smp_init_cpus(unsigned int ncores); -static inline void shmobile_init_late(void) +static inline void __init shmobile_init_late(void) { shmobile_suspend_init(); shmobile_cpuidle_init();