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/pm34xx.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/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index baee8722b477..001eff290cdb 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -40,12 +40,12 @@ | |||
| 40 | #include "powerdomain.h" | 40 | #include "powerdomain.h" |
| 41 | #include <plat/sdrc.h> | 41 | #include <plat/sdrc.h> |
| 42 | #include <plat/prcm.h> | 42 | #include <plat/prcm.h> |
| 43 | #include <plat/gpmc.h> | ||
| 44 | #include <plat-omap/dma-omap.h> | 43 | #include <plat-omap/dma-omap.h> |
| 45 | 44 | ||
| 46 | #include "common.h" | 45 | #include "common.h" |
| 47 | #include "cm2xxx_3xxx.h" | 46 | #include "cm2xxx_3xxx.h" |
| 48 | #include "cm-regbits-34xx.h" | 47 | #include "cm-regbits-34xx.h" |
| 48 | #include "gpmc.h" | ||
| 49 | #include "prm-regbits-34xx.h" | 49 | #include "prm-regbits-34xx.h" |
| 50 | 50 | ||
| 51 | #include "prm2xxx_3xxx.h" | 51 | #include "prm2xxx_3xxx.h" |