diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /arch/i386/pci/irq.c | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/pci/irq.c')
| -rw-r--r-- | arch/i386/pci/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 326a2edc3834..cddafe33ff7c 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -11,12 +11,11 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/irq.h> | ||
| 15 | #include <linux/dmi.h> | 14 | #include <linux/dmi.h> |
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 17 | #include <asm/smp.h> | 16 | #include <asm/smp.h> |
| 18 | #include <asm/io_apic.h> | 17 | #include <asm/io_apic.h> |
| 19 | #include <asm/hw_irq.h> | 18 | #include <linux/irq.h> |
| 20 | #include <linux/acpi.h> | 19 | #include <linux/acpi.h> |
| 21 | 20 | ||
| 22 | #include "pci.h" | 21 | #include "pci.h" |