diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/mach-iop13xx/iq81340mc.c | |
| parent | xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/mach-iop13xx/iq81340mc.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/iq81340mc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c index 77b24cd1d88d..5051c03d437c 100644 --- a/arch/arm/mach-iop13xx/iq81340mc.c +++ b/arch/arm/mach-iop13xx/iq81340mc.c @@ -18,14 +18,14 @@ */ #include <linux/pci.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/pci.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/arch/pci.h> +#include <mach/pci.h> #include <asm/mach/time.h> -#include <asm/arch/time.h> +#include <mach/time.h> extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */ |