diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-11 15:21:24 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 15:21:24 -0800 |
| commit | 8171d88089ad63fc442b2bf32af7c18653adc5cb (patch) | |
| tree | dfde2fd974b8d15d1a1a5a2c13d57d5fe9dd8e76 /arch/arm/mach-omap2/Makefile | |
| parent | 4d0226042c05588be47b06bc1dbe7a09c9c540a4 (diff) | |
| parent | cf22854cee10e16e28b1dde136c37e82b7d503ee (diff) | |
Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 8cb16777661..1d54ad349bf 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -31,7 +31,7 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o ifeq ($(CONFIG_PM),y) obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o -obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o +obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o endif |