summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm44xx.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-12-13 04:09:22 +0400
committerOlof Johansson <olof@lixom.net>2012-12-13 04:10:00 +0400
commit4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch)
tree59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/pm44xx.c
parent5c1af2a7011bf719807de360cb64c2f610269a38 (diff)
parentfb6842a7bc44bf719bfe85d5819a153d7c215510 (diff)
downloadlinux-4a76411ea3f1da9032e031f8fff8894b97d141b2.tar.xz
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
-rw-r--r--arch/arm/mach-omap2/pm44xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index f2d69be9b77e..aa6fd98f606e 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -18,6 +18,7 @@
#include <linux/slab.h>
#include <asm/system_misc.h>
+#include "soc.h"
#include "common.h"
#include "clockdomain.h"
#include "powerdomain.h"