diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 17:21:34 +0100 |
| commit | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (patch) | |
| tree | 48716af89f175c89a9be2247f77e13099980e43f /arch/arm/mach-omap2/Makefile | |
| parent | 5a07055a3849574f4fbe5d0ce7cd2d26ab9a37c1 (diff) | |
| parent | 2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff) | |
Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index e7cf1b4357c..800639e7c6a 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -14,7 +14,10 @@ obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o # Power Management -obj-$(CONFIG_PM) += pm.o sleep.o +ifeq ($(CONFIG_PM),y) +obj-y += pm.o +obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o +endif # Clock framework obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o |