summaryrefslogtreecommitdiffstats
path: root/arch/i386/pci/acpi.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 10:16:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 10:16:31 -0400
commit2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch)
treeaf5f33b265318e0f4b61f788691fe4f780ec402c /arch/i386/pci/acpi.c
parentc1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff)
parented39f731ab2e77e58122232f6e27333331d7793d (diff)
downloadop-kernel-dev-2ee73cc2d507df7b28050fba5d08bd33dd34848c.zip
op-kernel-dev-2ee73cc2d507df7b28050fba5d08bd33dd34848c.tar.gz
Merge /spare/repo/linux-2.6/
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 2941674..4c4522b 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"
OpenPOWER on IntegriCloud