diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-23 17:29:36 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-23 17:29:36 -0700 |
| commit | 39cdd14570e3c32728d407cb38de17e80cf16104 (patch) | |
| tree | 7e0f3473e186d84aa8110f39075381e07fead5d2 /arch/arm/mach-omap2/Makefile | |
| parent | 172c11351576cf5daa8f1b02a265bf84de8bbed1 (diff) | |
| parent | e933ec7c4ebd7e7daaad67b22e5f4a9a0ab102ea (diff) | |
| download | op-kernel-dev-39cdd14570e3c32728d407cb38de17e80cf16104.zip op-kernel-dev-39cdd14570e3c32728d407cb38de17e80cf16104.tar.gz | |
Merge branch 'pm-runtime' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 826cb09..e599ae2 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -49,14 +49,18 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o # Power Management ifeq ($(CONFIG_PM),y) obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o -obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o -obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o -obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o +obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o pm_bus.o +obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o pm_bus.o +obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o pm_bus.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o AFLAGS_sleep24xx.o :=-Wa,-march=armv6 AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a +ifeq ($(CONFIG_PM_VERBOSE),y) +CFLAGS_pm_bus.o += -DDEBUG +endif + endif # PRCM |
