diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
| commit | ef0eaa13362041f531f951b89362bfbc177e2bc0 (patch) | |
| tree | e2d43099698aa238f9d108c67451871b0d4073f9 /arch/i386/kernel/io_apic.c | |
| parent | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 5a77c52b20a..cc5d7ac5b2e 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -2387,15 +2387,11 @@ void __init setup_IO_APIC(void) sync_Arb_IDs(); setup_IO_APIC_irqs(); init_IO_APIC_traps(); + check_timer(); if (!acpi_ioapic) print_IO_APIC(); } -void __init IO_APIC_late_time_init(void) -{ - check_timer(); -} - /* * Called after all the initialization is done. If we didnt find any * APIC bugs then we can allow the modify fast path |