diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:07:18 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:07:18 +0200 |
| commit | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch) | |
| tree | 23db2359ad86957359da7c8a458e25eddb08d776 /arch/arm/mach-omap2/board-rx51.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-h... (diff) | |
| parent | Merge tag 'gpmc-czimage' of git://gitorious.org/x0148406-public/linux-kernel ... (diff) | |
| download | linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.xz linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.zip | |
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 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "common.h" #include <plat-omap/dma-omap.h> -#include <plat/gpmc.h> #include <plat/usb.h> +#include "common.h" #include "mux.h" +#include "gpmc.h" #include "pm.h" #include "sdram-nokia.h" |