Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.…

…6-ji into fixes * 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji: ARM: picoxcell: fix sched_clock() cleanup fallout
mijoda · Jan 17, 2012 · bbc390a · bbc390a
2 parents c2bc3a3 + 6b2a055
commit bbc390a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/arm/mach-picoxcell/time.c b/arch/arm/mach-picoxcell/time.c
@@ -67,7 +67,7 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)
 
 static void __iomem *sched_io_base;
 
-unsigned u32 notrace picoxcell_read_sched_clock(void)
+static u32 picoxcell_read_sched_clock(void)
 {
 	return __raw_readl(sched_io_base);
 }