summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-16 21:54:19 (GMT)
committerTony Lindgren <tony@atomide.com>2012-10-16 21:54:19 (GMT)
commit94709014ea8d2f24fbc1e6eb6982e801e325bd47 (patch)
treea99f2f7184d414d44fccb648a71565cab2c670b3 /arch/arm/mach-omap2/pm34xx.c
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
parent3ef5d0071cf6c8b9a00b559232bb700ad59999d7 (diff)
downloadlinux-fsl-qoriq-94709014ea8d2f24fbc1e6eb6982e801e325bd47.tar.xz
Merge tag 'gpmc-czimage' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/cleanup-headers-gpmc
gpmc cleanup for common ARM zImage
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 ba670db..ed98f4f 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -40,7 +40,7 @@
#include "powerdomain.h"
#include <plat/sdrc.h>
#include <plat/prcm.h>
-#include <plat/gpmc.h>
+#include "gpmc.h"
#include <plat/dma.h>
#include "common.h"