diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/asm-i386 | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/io_apic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h index 7d3e82d4b69d..5092e819b8a2 100644 --- a/include/asm-i386/io_apic.h +++ b/include/asm-i386/io_apic.h | |||
| @@ -199,6 +199,7 @@ extern int io_apic_get_unique_id (int ioapic, int apic_id); | |||
| 199 | extern int io_apic_get_version (int ioapic); | 199 | extern int io_apic_get_version (int ioapic); |
| 200 | extern int io_apic_get_redir_entries (int ioapic); | 200 | extern int io_apic_get_redir_entries (int ioapic); |
| 201 | extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); | 201 | extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); |
| 202 | extern int timer_uses_ioapic_pin_0; | ||
| 202 | #endif /* CONFIG_ACPI */ | 203 | #endif /* CONFIG_ACPI */ |
| 203 | 204 | ||
| 204 | extern int (*ioapic_renumber_irq)(int ioapic, int irq); | 205 | extern int (*ioapic_renumber_irq)(int ioapic, int irq); |