From: Kai Svahn Date: Fri, 26 Jan 2007 21:05:41 +0000 (-0800) Subject: ARM: OMAP: Merge PM code from N800 tree X-Git-Tag: v2.6.23-omap1~149^2~10 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=910ad14e1bc039a4fca7b9e137ce4634b5b99057;p=pandora-kernel.git ARM: OMAP: Merge PM code from N800 tree This patch merges omap2 PM code from N800 tree. Patch adds support for sleep while idle for omap2 and handy serial console debbugging code. It also moves code from pm-domain.c to pm.c. This code can be used as a base for developing power management for all omap24xx boards. Signed-off-by: Kai Svahn Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b05b738d31e6..036f4eee4b70 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -9,7 +9,7 @@ obj-y := irq.o id.o io.o sram-fn.o memory.o prcm.o clock.o mux.o devices.o \ obj-$(CONFIG_OMAP_MPU_TIMER) += timer-gp.o # Power Management -obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o +obj-$(CONFIG_PM) += pm.o sleep.o # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o Reading git-diff-tree failed