aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorNick Piggin <nickpiggin@yahoo.com.au>2005-09-30 12:34:42 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 13:58:37 -0400
commitb33fa1f3c3ec05e54e73f06c4578948c55d89ef6 (patch)
treedd3c961546dedc360487f5188dc36baa7daefb01 /arch/i386
parent03cdc0c304e1c068d49adc32264f07af76253e4c (diff)
[PATCH] i386: include linux/irq.h rather than asm/hw_irq.h
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>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/acpi/boot.c2
-rw-r--r--arch/i386/pci/acpi.c2
-rw-r--r--arch/i386/pci/irq.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 838437b2d241..b66c13c0cc0f 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -29,12 +29,12 @@
29#include <linux/efi.h> 29#include <linux/efi.h>
30#include <linux/module.h> 30#include <linux/module.h>
31#include <linux/dmi.h> 31#include <linux/dmi.h>
32#include <linux/irq.h>
32 33
33#include <asm/pgtable.h> 34#include <asm/pgtable.h>
34#include <asm/io_apic.h> 35#include <asm/io_apic.h>
35#include <asm/apic.h> 36#include <asm/apic.h>
36#include <asm/io.h> 37#include <asm/io.h>
37#include <asm/irq.h>
38#include <asm/mpspec.h> 38#include <asm/mpspec.h>
39 39
40#ifdef CONFIG_X86_64 40#ifdef CONFIG_X86_64
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index 7e7a202df3c8..4c4522b43be5 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -1,7 +1,7 @@
1#include <linux/pci.h> 1#include <linux/pci.h>
2#include <linux/acpi.h> 2#include <linux/acpi.h>
3#include <linux/init.h> 3#include <linux/init.h>
4#include <asm/hw_irq.h> 4#include <linux/irq.h>
5#include <asm/numa.h> 5#include <asm/numa.h>
6#include "pci.h" 6#include "pci.h"
7 7
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 281ed8ab347a..cddafe33ff7c 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -15,7 +15,7 @@
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/smp.h> 16#include <asm/smp.h>
17#include <asm/io_apic.h> 17#include <asm/io_apic.h>
18#include <asm/hw_irq.h> 18#include <linux/irq.h>
19#include <linux/acpi.h> 19#include <linux/acpi.h>
20 20
21#include "pci.h" 21#include "pci.h"