diff options
| author | Kevin Hilman | 2009-05-28 19:56:16 +0200 |
|---|---|---|
| committer | Kevin Hilman | 2009-05-28 19:58:50 +0200 |
| commit | 8bd229492209c0c7d050e2f9a600c12f035d72f7 (patch) | |
| tree | c76039df215b1c3ba58adb23845baa4af40f25fe /arch/arm/mach-omap2/Makefile | |
| parent | Revert "ARM: OMAP: Mask interrupts when disabling interrupts, v2" (diff) | |
| download | kernel-qcow2-linux-8bd229492209c0c7d050e2f9a600c12f035d72f7.tar.gz kernel-qcow2-linux-8bd229492209c0c7d050e2f9a600c12f035d72f7.tar.xz kernel-qcow2-linux-8bd229492209c0c7d050e2f9a600c12f035d72f7.zip | |
OMAP2/3: PM: push core PM code from linux-omap
This patch is to sync the core linux-omap PM code with mainline. This
code has evolved and been used for a while the linux-omap tree, but
the attempt here is to finally get this into mainline.
Following this will be a series of patches from the 'PM branch' of the
linux-omap tree to add full PM hardware support from the linux-omap
tree.
Much of this PM core code was written by Jouni Hogander with
significant contributions from Paul Walmsley as well as many others
from Nokia, Texas Instruments and linux-omap community.
Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index bf3827ae2c5f..6fd1c1f77398 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -25,8 +25,10 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o # Power Management ifeq ($(CONFIG_PM),y) -obj-y += pm.o +obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o +obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o +obj-$(CONFIG_PM_DEBUG) += pm-debug.o endif # Clock framework |