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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}