Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b33fa1f3 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

[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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 03cdc0c3

arch/i386/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/i386/pci/acpi.c

+1 −1
Original line number Diff line number Diff line 
#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"

arch/i386/pci/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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"