diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-17 01:45:42 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-17 01:45:42 -0500 |
| commit | bbc390a6f275a7405a235b40b00ca0015a5cdb5b (patch) | |
| tree | 56b4e78a0c2f6c30a0d793a8abde460cc79bda11 /arch/arm/mach-picoxcell | |
| parent | c2bc3a316a7281f67e36b34dac2802cbe36a9128 (diff) | |
| parent | 6b2a05584c5939eba24d22037dcb4cc71e5345e5 (diff) | |
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
Diffstat (limited to 'arch/arm/mach-picoxcell')
| -rw-r--r-- | arch/arm/mach-picoxcell/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-picoxcell/time.c b/arch/arm/mach-picoxcell/time.c index 6c89cf8ab22e..2ecba6743b8e 100644 --- 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) | |||
| 67 | 67 | ||
| 68 | static void __iomem *sched_io_base; | 68 | static void __iomem *sched_io_base; |
| 69 | 69 | ||
| 70 | unsigned u32 notrace picoxcell_read_sched_clock(void) | 70 | static u32 picoxcell_read_sched_clock(void) |
| 71 | { | 71 | { |
| 72 | return __raw_readl(sched_io_base); | 72 | return __raw_readl(sched_io_base); |
| 73 | } | 73 | } |