diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:50:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:17:36 -0400 |
| commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /include/asm-x86/arch_hooks.h | |
| parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c (diff) | |
| parent | 11494547b1754c4f3bd7f707ab869e2adf54d52f (diff) | |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
Diffstat (limited to 'include/asm-x86/arch_hooks.h')
| -rw-r--r-- | include/asm-x86/arch_hooks.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/arch_hooks.h b/include/asm-x86/arch_hooks.h index 72adc3a109cc..de4596b24c23 100644 --- a/include/asm-x86/arch_hooks.h +++ b/include/asm-x86/arch_hooks.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | /* these aren't arch hooks, they are generic routines | 12 | /* these aren't arch hooks, they are generic routines |
| 13 | * that can be used by the hooks */ | 13 | * that can be used by the hooks */ |
| 14 | extern void init_ISA_irqs(void); | 14 | extern void init_ISA_irqs(void); |
| 15 | extern void apic_intr_init(void); | ||
| 16 | extern void smp_intr_init(void); | ||
| 17 | extern irqreturn_t timer_interrupt(int irq, void *dev_id); | 15 | extern irqreturn_t timer_interrupt(int irq, void *dev_id); |
| 18 | 16 | ||
| 19 | /* these are the defined hooks */ | 17 | /* these are the defined hooks */ |