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-omap1/Makefile | |
| parent | 172c11351576cf5daa8f1b02a265bf84de8bbed1 (diff) | |
| parent | e933ec7c4ebd7e7daaad67b22e5f4a9a0ab102ea (diff) | |
| download | kernel_goldelico_gta04-39cdd14570e3c32728d407cb38de17e80cf16104.zip kernel_goldelico_gta04-39cdd14570e3c32728d407cb38de17e80cf16104.tar.gz kernel_goldelico_gta04-39cdd14570e3c32728d407cb38de17e80cf16104.tar.bz2 | |
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-omap1/Makefile')
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index facfaeb..9a304d8 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_OMAP_MPU_TIMER) += time.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management -obj-$(CONFIG_PM) += pm.o sleep.o +obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o # DSP obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o |