diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-17 07:45:42 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-17 07:45:42 +0100 |
| commit | bbc390a6f275a7405a235b40b00ca0015a5cdb5b (patch) | |
| tree | 56b4e78a0c2f6c30a0d793a8abde460cc79bda11 /arch | |
| parent | Merge branch 'x86/rdrand' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | ARM: picoxcell: fix sched_clock() cleanup fallout (diff) | |
| download | linux-bbc390a6f275a7405a235b40b00ca0015a5cdb5b.tar.xz linux-bbc390a6f275a7405a235b40b00ca0015a5cdb5b.zip | |
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')
| -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) 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); } |