diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/i386/pci | |
| parent | [PATCH] hostap: Unregister netdevs before freeing local data (diff) | |
| parent | [PATCH] s390: qeth driver fixes (diff) | |
| download | linux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz linux-3c8c7b2f32c52b259daa7564fefd582146799b23.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/pci')
| -rw-r--r-- | arch/i386/pci/acpi.c | 1 | ||||
| -rw-r--r-- | arch/i386/pci/irq.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c index 2941674f35eb..4c4522b43be5 100644 --- a/arch/i386/pci/acpi.c +++ b/arch/i386/pci/acpi.c @@ -2,7 +2,6 @@ #include <linux/acpi.h> #include <linux/init.h> #include <linux/irq.h> -#include <asm/hw_irq.h> #include <asm/numa.h> #include "pci.h" 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 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/dmi.h> #include <asm/io.h> #include <asm/smp.h> #include <asm/io_apic.h> -#include <asm/hw_irq.h> +#include <linux/irq.h> #include <linux/acpi.h> #include "pci.h" |