diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-01-04 11:42:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 14:23:02 +0100 |
| commit | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (patch) | |
| tree | 11eac946aedcbe19c8c386a9d5fae55802ab7365 /arch/arm/mach-sa1100/time.c | |
| parent | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s... (diff) | |
| download | linux-ef3a0bf5bfadbace156fa2a3b9c753df2de41df2.tar.xz linux-ef3a0bf5bfadbace156fa2a3b9c753df2de41df2.zip | |
ARM: 7269/1: mach-sa1100: fix sched_clock breakage
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-sa1100/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 1ee6d4ca8dd7..69e33535dee6 100644 --- 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 sa1100_read_sched_clock(void) { return OSCR; } |