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 #include -static u32 notrace sa100_read_sched_clock(void) +static u32 notrace sa1100_read_sched_clock(void) { return OSCR; }