diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-x86_64/apic.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-x86_64/apic.h')
| -rw-r--r-- | include/asm-x86_64/apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h index 9e66d32330c9..e81d0f289f0b 100644 --- a/include/asm-x86_64/apic.h +++ b/include/asm-x86_64/apic.h | |||
| @@ -77,7 +77,7 @@ extern void sync_Arb_IDs (void); | |||
| 77 | extern void init_bsp_APIC (void); | 77 | extern void init_bsp_APIC (void); |
| 78 | extern void setup_local_APIC (void); | 78 | extern void setup_local_APIC (void); |
| 79 | extern void init_apic_mappings (void); | 79 | extern void init_apic_mappings (void); |
| 80 | extern void smp_local_timer_interrupt (struct pt_regs * regs); | 80 | extern void smp_local_timer_interrupt (void); |
| 81 | extern void setup_boot_APIC_clock (void); | 81 | extern void setup_boot_APIC_clock (void); |
| 82 | extern void setup_secondary_APIC_clock (void); | 82 | extern void setup_secondary_APIC_clock (void); |
| 83 | extern int APIC_init_uniprocessor (void); | 83 | extern int APIC_init_uniprocessor (void); |