diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:26:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:26:52 -0700 |
| commit | 4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 (patch) | |
| tree | 9dc3fc8276d987058cd8f3826113c5baa2a1b595 /include | |
| parent | 529980c8b0b04e8a3f6606cdc156f1f81a5d68cd (diff) | |
| parent | 344a076110f4ecb16ea6d286b63be696604982ed (diff) | |
| download | op-kernel-dev-4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648.zip op-kernel-dev-4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648.tar.gz | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/iosapic.h | 4 | ||||
| -rw-r--r-- | include/asm-ia64/irq.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index a429fe2..20f98f1 100644 --- a/include/asm-ia64/iosapic.h +++ b/include/asm-ia64/iosapic.h @@ -80,12 +80,9 @@ extern int iosapic_remove (unsigned int gsi_base); #endif /* CONFIG_HOTPLUG */ extern int gsi_to_vector (unsigned int gsi); extern int gsi_to_irq (unsigned int gsi); -extern void iosapic_enable_intr (unsigned int vector); extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, unsigned long trigger); -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ extern void iosapic_unregister_intr (unsigned int irq); -#endif extern void __init iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, unsigned long polarity, unsigned long trigger); @@ -97,7 +94,6 @@ extern int __init iosapic_register_platform_intr (u32 int_type, unsigned long trigger); extern unsigned int iosapic_version (char __iomem *addr); -extern void iosapic_pci_fixup (int); #ifdef CONFIG_NUMA extern void __devinit map_iosapic_to_node (unsigned int, int); #endif diff --git a/include/asm-ia64/irq.h b/include/asm-ia64/irq.h index cd984d0..dbe86c0 100644 --- a/include/asm-ia64/irq.h +++ b/include/asm-ia64/irq.h @@ -35,8 +35,4 @@ extern void disable_irq_nosync (unsigned int); extern void enable_irq (unsigned int); extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); -struct irqaction; -struct pt_regs; -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *); - #endif /* _ASM_IA64_IRQ_H */ |
