From bd2bcda6c7e042118cdea7561fb2f04516a8983d Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 4 Jan 2012 11:42:19 +0100
Subject: [PATCH] --- yaml --- r: 279931 b: refs/heads/master c:
 ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 h: refs/heads/master i:   279929:
 03430e5affd20e3feb63336964d125c0fad8f942   279927:
 110082a8799202230b3d14d5311a57c9acd43ecb v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-sa1100/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c25e9c238e3a..c12efdd577b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e
+refs/heads/master: ef3a0bf5bfadbace156fa2a3b9c753df2de41df2
diff --git a/trunk/arch/arm/mach-sa1100/time.c b/trunk/arch/arm/mach-sa1100/time.c
index 1ee6d4ca8dd7..69e33535dee6 100644
--- a/trunk/arch/arm/mach-sa1100/time.c
+++ b/trunk/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;
 }