diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 14:48:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 14:49:32 +1000 |
| commit | cdab2bb105dbb93c7ff1b6405a6a100ccdeb2d8d (patch) | |
| tree | 491c13cfcc9f516c74709c1a4e39c3bebf80a3a3 | |
| parent | 13619842fa805f1141639901212db35ac1f7c4ba (diff) | |
clocksource: fix up for generic i8253 conversions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | arch/mips/kernel/i8253.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/i8253.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index e4660bac08e0..227373e8e2b8 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c @@ -10,6 +10,7 @@ #include <linux/smp.h> #include <linux/spinlock.h> #include <linux/irq.h> +#include <linux/clocksource.h> #include <asm/delay.h> #include <asm/i8253.h> @@ -130,6 +131,6 @@ static int __init init_pit_clocksource(void) if (num_possible_cpus() > 1) /* PIT does not scale! */ return 0; - return clocksource_pit_init(); + return clocksource_i8253_init(); } arch_initcall(init_pit_clocksource); diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index a97aefc89e3c..21f121a8473d 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c @@ -11,6 +11,7 @@ #include <linux/delay.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/clocksource.h> #include <asm/i8253.h> #include <asm/hpet.h> @@ -130,7 +131,7 @@ static int __init init_pit_clocksource(void) pit_ce.mode != CLOCK_EVT_MODE_PERIODIC) return 0; - return clocksource_pit_init(); + return clocksource_i8253_init(); } arch_initcall(init_pit_clocksource); |