aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/sleep.S
diff options
context:
space:
mode:
authorGravatar Kevin Hilman <khilman@deeprootsystems.com> 2009-05-15 11:29:28 -0700
committerGravatar Kevin Hilman <khilman@deeprootsystems.com> 2009-05-28 10:59:11 -0700
commitc912f7e1eae169aaca333b4c5da3f36c98f2ccb0 (patch)
tree15c4164798bcc95211df2dedb09badf9af0b39c6 /arch/arm/mach-omap1/sleep.S
parentOMAP3: PM: prevent module wakeups from waking IVA2 (diff)
downloadlinux-c912f7e1eae169aaca333b4c5da3f36c98f2ccb0.tar.gz
linux-c912f7e1eae169aaca333b4c5da3f36c98f2ccb0.tar.bz2
linux-c912f7e1eae169aaca333b4c5da3f36c98f2ccb0.zip
OMAP1: PM: update and decouple from OMAP2/3 PM core
Update OMAP1-specific PM infrastructure. This is a sync of what is in linux-omap for OMAP1. This mostly de-couples OMAP1 PM from OMAP2/3 PM and renames things accordingly, and removes omap2/3 specific code from OMAP1 specific headers. Original OMAP1 decoupling patch for OMAP PM branch by Paul Walmsley. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap1/sleep.S')
-rw-r--r--arch/arm/mach-omap1/sleep.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S
index f3eac932092d..22e8568339b0 100644
--- a/arch/arm/mach-omap1/sleep.S
+++ b/arch/arm/mach-omap1/sleep.S
@@ -35,7 +35,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/io.h>
-#include <mach/pm.h>
+#include "pm.h"
.text