diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 (patch) | |
tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 /arch/x86/include/asm/i8259.h | |
parent | 15e957d08dd4a841359cfec59ecb74041e0097aa (diff) | |
parent | e0e42142bab96404de535cceb85d6533d5ad7942 (diff) | |
download | op-kernel-dev-4420471f14b79f2a42e4603be7794ea49b68bca4.zip op-kernel-dev-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.gz |
Merge branch 'x86/apic' into irq/numa
Conflicts:
arch/x86/kernel/apic/io_apic.c
Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/i8259.h')
-rw-r--r-- | arch/x86/include/asm/i8259.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index 1a99e6c..58d7091 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -60,8 +60,4 @@ extern struct irq_chip i8259A_chip; extern void mask_8259A(void); extern void unmask_8259A(void); -#ifdef CONFIG_X86_32 -extern void init_ISA_irqs(void); -#endif - #endif /* _ASM_X86_I8259_H */ |