diff --git a/[refs] b/[refs] index 309f1a4573ea..e872847a78c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7cf0edb8f7d53bfc8b5e40893415d48656c0399 +refs/heads/master: c481887f2b74f87f714e2b76b8b834e57912bd0a diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index a925a8eae121..cc82fd675f91 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -117,7 +117,6 @@ static struct clock_event_device decrementer_clockevent = { }; static DEFINE_PER_CPU(struct clock_event_device, decrementers); -void init_decrementer_clockevent(void); static DEFINE_PER_CPU(u64, decrementer_next_tb); #ifdef CONFIG_PPC_ISERIES @@ -836,7 +835,7 @@ static void register_decrementer_clockevent(int cpu) clockevents_register_device(dec); } -void init_decrementer_clockevent(void) +static void __init init_decrementer_clockevent(void) { int cpu = smp_processor_id();