Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

[linux-2.6-omap-h63xx.git] / arch / i386 / pci / acpi.c

diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index 7e7a202df3c8dc1903874cb1a7b175e1def2bf8c..4c4522b43be5e9a6951e0b4cb7252f2ee67b73e9 100644 (file)
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -1,7 +1,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/init.h>
-#include <asm/hw_irq.h>
+#include <linux/irq.h>
 #include <asm/numa.h>
 #include "pci.h"