diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-22 06:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-22 06:44:20 -0400 |
| commit | 3568b71d46bea87da1936902b6fbb2a3b1154b3d (patch) | |
| tree | 621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc /arch/arm/mach-ns9xxx/time-ns9360.c | |
| parent | 2a3313f494c2f3f74a27d66f0f14b38558b7dba2 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
Merge commit 'v2.6.30-rc3' into x86/urgent
Merge reason: hpet.c changed upstream, make sure we test against that
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-ns9xxx/time-ns9360.c')
| -rw-r--r-- | arch/arm/mach-ns9xxx/time-ns9360.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/time-ns9360.c b/arch/arm/mach-ns9xxx/time-ns9360.c index 41df69721769..77281260358a 100644 --- a/arch/arm/mach-ns9xxx/time-ns9360.c +++ b/arch/arm/mach-ns9xxx/time-ns9360.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #define TIMER_CLOCKEVENT 1 | 25 | #define TIMER_CLOCKEVENT 1 |
| 26 | static u32 latch; | 26 | static u32 latch; |
| 27 | 27 | ||
| 28 | static cycle_t ns9360_clocksource_read(void) | 28 | static cycle_t ns9360_clocksource_read(struct clocksource *cs) |
| 29 | { | 29 | { |
| 30 | return __raw_readl(SYS_TR(TIMER_CLOCKSOURCE)); | 30 | return __raw_readl(SYS_TR(TIMER_CLOCKSOURCE)); |
| 31 | } | 31 | } |