diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:07:18 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:07:18 -0400 |
| commit | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch) | |
| tree | 23db2359ad86957359da7c8a458e25eddb08d776 /arch/arm/mach-omap2/board-rx51.c | |
| parent | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (diff) | |
| parent | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/pm34xx.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 3b1c03e1c741..63b33c63bd94 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -23,12 +23,12 @@ | |||
| 23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
| 24 | #include <asm/mach/map.h> | 24 | #include <asm/mach/map.h> |
| 25 | 25 | ||
| 26 | #include "common.h" | ||
| 27 | #include <plat-omap/dma-omap.h> | 26 | #include <plat-omap/dma-omap.h> |
| 28 | #include <plat/gpmc.h> | ||
| 29 | #include <plat/usb.h> | 27 | #include <plat/usb.h> |
| 30 | 28 | ||
| 29 | #include "common.h" | ||
| 31 | #include "mux.h" | 30 | #include "mux.h" |
| 31 | #include "gpmc.h" | ||
| 32 | #include "pm.h" | 32 | #include "pm.h" |
| 33 | #include "sdram-nokia.h" | 33 | #include "sdram-nokia.h" |
| 34 | 34 | ||