diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /arch/arm/mach-iop13xx/iq81340sc.c | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
Diffstat (limited to 'arch/arm/mach-iop13xx/iq81340sc.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/iq81340sc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index e8522b3b8163..bc443073a8e3 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c | |||
| @@ -18,14 +18,14 @@ | |||
| 18 | */ | 18 | */ |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | 20 | ||
| 21 | #include <asm/hardware.h> | 21 | #include <mach/hardware.h> |
| 22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
| 23 | #include <asm/mach/pci.h> | 23 | #include <asm/mach/pci.h> |
| 24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/arch/pci.h> | 26 | #include <mach/pci.h> |
| 27 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
| 28 | #include <asm/arch/time.h> | 28 | #include <mach/time.h> |
| 29 | 29 | ||
| 30 | extern int init_atu; | 30 | extern int init_atu; |
| 31 | 31 | ||