commit bbc390a6f275a7405a235b40b00ca0015a5cdb5b
author Olof Johansson <olof@lixom.net> Mon Jan 16 22:45:42 2012 -0800
committer Olof Johansson <olof@lixom.net> Mon Jan 16 22:45:42 2012 -0800
tree 56b4e78a0c2f6c30a0d793a8abde460cc79bda11
parent c2bc3a316a7281f67e36b34dac2802cbe36a9128
parent 6b2a05584c5939eba24d22037dcb4cc71e5345e5

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

arch/arm/mach-picoxcell/time.c

diff --git a/arch/arm/mach-picoxcell/time.c b/arch/arm/mach-picoxcell/time.c
index 6c89cf8..2ecba67 100644
--- a/arch/arm/mach-picoxcell/time.c
+++ b/arch/arm/mach-picoxcell/time.c
@@ -67,7 +67,7 @@
 
 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);
 }