From 1d1f1c53df18be24650e53b0433e6a1f15f59643 Mon Sep 17 00:00:00 2001
From: Nick Piggin <nickpiggin@yahoo.com.au>
Date: Sat, 1 Oct 2005 02:34:42 +1000
Subject: [PATCH] --- yaml --- r: 9500 b: refs/heads/master c:
 b33fa1f3c3ec05e54e73f06c4578948c55d89ef6 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/kernel/acpi/boot.c | 2 +-
 trunk/arch/i386/pci/acpi.c         | 2 +-
 trunk/arch/i386/pci/irq.c          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 58d870c32d8e..ccbf928b785b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03cdc0c304e1c068d49adc32264f07af76253e4c
+refs/heads/master: b33fa1f3c3ec05e54e73f06c4578948c55d89ef6
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c
index 838437b2d241..b66c13c0cc0f 100644
--- a/trunk/arch/i386/kernel/acpi/boot.c
+++ b/trunk/arch/i386/kernel/acpi/boot.c
@@ -29,12 +29,12 @@
 #include <linux/efi.h>
 #include <linux/module.h>
 #include <linux/dmi.h>
+#include <linux/irq.h>
 
 #include <asm/pgtable.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/mpspec.h>
 
 #ifdef	CONFIG_X86_64
diff --git a/trunk/arch/i386/pci/acpi.c b/trunk/arch/i386/pci/acpi.c
index 7e7a202df3c8..4c4522b43be5 100644
--- a/trunk/arch/i386/pci/acpi.c
+++ b/trunk/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"
 
diff --git a/trunk/arch/i386/pci/irq.c b/trunk/arch/i386/pci/irq.c
index 281ed8ab347a..cddafe33ff7c 100644
--- a/trunk/arch/i386/pci/irq.c
+++ b/trunk/arch/i386/pci/irq.c
@@ -15,7 +15,7 @@
 #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"