[PATCH] i386: include linux/irq.h rather than asm/hw_irq.h
authorNick Piggin <nickpiggin@yahoo.com.au>
Fri, 30 Sep 2005 16:34:42 +0000 (02:34 +1000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 17:58:37 +0000 (10:58 -0700)
I need the following patch to compile -git8 here, otherwise these
files fail to compile (asm/hw_irq.h needs definitions from
linux/irq.h and that file provides the required include ordering).

I did not do a full audit, though there looks to be many other
places that should get the same treatment, if this is  the right
way to do it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/acpi/boot.c
arch/i386/pci/acpi.c
arch/i386/pci/irq.c

index 838437b2d241bfbcb5bf560f410509cdca049ec2..b66c13c0cc0f8b45742021e35119067b3778d6dc 100644 (file)
 #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
index 7e7a202df3c8dc1903874cb1a7b175e1def2bf8c..4c4522b43be5e9a6951e0b4cb7252f2ee67b73e9 100644 (file)
@@ -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"
 
index 281ed8ab347ab0a37a50771e86e239d8c9dc825f..cddafe33ff7c522ca007569e0d73faade5465fc7 100644 (file)
@@ -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"