summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm44xx.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-16 09:21:08 +0400
committerOlof Johansson <olof@lixom.net>2011-12-16 09:21:08 +0400
commit705eb64e2ed78c63b9e2b6002b029ce8710ff7cf (patch)
treee4ad7ad6ce919dcc59460b89dfe63e9d2ff9bc63 /arch/arm/mach-omap2/pm44xx.c
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parentf36217f3a5b5b945619192c033c2785007931e49 (diff)
downloadlinux-705eb64e2ed78c63b9e2b6002b029ce8710ff7cf.tar.xz
Merge branch 'musb' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/musb
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
-rw-r--r--arch/arm/mach-omap2/pm44xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 59a870be8390..8edb015f5618 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -16,8 +16,8 @@
#include <linux/err.h>
#include <linux/slab.h>
+#include "common.h"
#include "powerdomain.h"
-#include <mach/omap4-common.h>
struct power_state {
struct powerdomain *pwrdm;