diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-22 22:39:23 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-22 22:39:23 +0100 |
| commit | b0a37dca72a05b7b579f288d8a67afeed96bffa5 (patch) | |
| tree | a3057a3debd078f569e90e709d7b320006d8cb32 /arch/arm/kernel/Makefile | |
| parent | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (diff) | |
| parent | 8e6f83bbdf770014c070c5a41c8e89617cb2a66b (diff) | |
Merge branch 'pm' into devel-stable
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index af32e466e1c..8fa83f54c96 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_MODULES) += armksyms.o module.o obj-$(CONFIG_ARTHUR) += arthur.o obj-$(CONFIG_ISA_DMA) += dma-isa.o obj-$(CONFIG_PCI) += bios32.o isa.o -obj-$(CONFIG_PM_SLEEP) += sleep.o +obj-$(CONFIG_PM_SLEEP) += sleep.o suspend.o obj-$(CONFIG_HAVE_SCHED_CLOCK) += sched_clock.o obj-$(CONFIG_SMP) += smp.o smp_tlb.o obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o |