summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-17 11:07:18 -0700
committerTony Lindgren <tony@atomide.com>2012-10-17 11:07:18 -0700
commit99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch)
tree23db2359ad86957359da7c8a458e25eddb08d776 /arch/arm/mach-omap2/pm34xx.c
parent94c657853bd228ebbc2c590b7f81efcc1dde3329 (diff)
parent94709014ea8d2f24fbc1e6eb6982e801e325bd47 (diff)
downloadop-kernel-dev-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.zip
op-kernel-dev-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index baee872..001eff2 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -40,12 +40,12 @@
#include "powerdomain.h"
#include <plat/sdrc.h>
#include <plat/prcm.h>
-#include <plat/gpmc.h>
#include <plat-omap/dma-omap.h>
#include "common.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-34xx.h"
+#include "gpmc.h"
#include "prm-regbits-34xx.h"
#include "prm2xxx_3xxx.h"
OpenPOWER on IntegriCloud