OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0b58ee
)
ARM: 7269/1: mach-sa1100: fix sched_clock breakage
author
Linus Walleij
<linus.walleij@linaro.org>
Wed, 4 Jan 2012 10:42:19 +0000
(11:42 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:23:02 +0000
(13:23 +0000)
Fixed up a simple typo in the runtime sched_clock conversion
so we compile again.
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/time.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-sa1100/time.c
b/arch/arm/mach-sa1100/time.c
index
1ee6d4c
..
69e3353
100644
(file)
--- a/
arch/arm/mach-sa1100/time.c
+++ b/
arch/arm/mach-sa1100/time.c
@@
-19,7
+19,7
@@
#include <asm/sched_clock.h>
#include <mach/hardware.h>
-static u32 notrace sa100_read_sched_clock(void)
+static u32 notrace sa1
1
00_read_sched_clock(void)
{
return OSCR;
}