diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
| commit | 5aa37e4f0614e3b1f385426ce1e962e84c275bdf (patch) | |
| tree | 3d8c30207989d09fde8ffb2c3c44c6b923d70062 /arch/arm/mach-ixp23xx/pci.c | |
| parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
| parent | b76d69ed721e8365739c3bd5dd7891efbea88494 (diff) | |
| download | linux-5aa37e4f0614e3b1f385426ce1e962e84c275bdf.tar.xz | |
Merge branch 'x86/core' into x86/apic
Diffstat (limited to 'arch/arm/mach-ixp23xx/pci.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c index 227f808dc0ec..701d60aa0efd 100644 --- a/arch/arm/mach-ixp23xx/pci.c +++ b/arch/arm/mach-ixp23xx/pci.c @@ -31,8 +31,7 @@ #include <asm/sizes.h> #include <asm/system.h> #include <asm/mach/pci.h> -#include <asm/mach-types.h> -#include <asm/hardware.h> +#include <mach/hardware.h> extern int (*external_fault) (unsigned long, struct pt_regs *); |