summaryrefslogtreecommitdiffstats
path: root/arch/i386/pci/acpi.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 04:06:19 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 04:06:19 +0200
commit3c8c7b2f32c52b259daa7564fefd582146799b23 (patch)
tree59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/i386/pci/acpi.c
parent[PATCH] hostap: Unregister netdevs before freeing local data (diff)
parent[PATCH] s390: qeth driver fixes (diff)
downloadlinux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz
linux-3c8c7b2f32c52b259daa7564fefd582146799b23.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/pci/acpi.c')
-rw-r--r--arch/i386/pci/acpi.c1
1 files changed, 0 insertions, 1 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"