diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-22 12:44:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-22 12:44:20 +0200 |
| commit | 3568b71d46bea87da1936902b6fbb2a3b1154b3d (patch) | |
| tree | 621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc /arch/x86/kernel/i8253.c | |
| parent | 2a3313f494c2f3f74a27d66f0f14b38558b7dba2 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
| download | blackbird-op-linux-3568b71d46bea87da1936902b6fbb2a3b1154b3d.tar.gz blackbird-op-linux-3568b71d46bea87da1936902b6fbb2a3b1154b3d.zip | |
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/x86/kernel/i8253.c')
| -rw-r--r-- | arch/x86/kernel/i8253.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 3475440baa54..c2e0bb0890d4 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c @@ -129,7 +129,7 @@ void __init setup_pit_timer(void) * to just read by itself. So use jiffies to emulate a free * running counter: */ -static cycle_t pit_read(void) +static cycle_t pit_read(struct clocksource *cs) { static int old_count; static u32 old_jifs; |
