diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 09:36:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 09:36:36 +0100 |
| commit | c825dda905bac330c2da7fabdf5c0ac28758b3cd (patch) | |
| tree | 597fe4f90c49f784a0dbf1596c027880747210ec /kernel/Makefile | |
| parent | Merge branch 'pm' into devel-stable (diff) | |
| parent | ARM: mm: Add strongly ordered descriptor support. (diff) | |
Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index eca595e2fd52..988cb3da7031 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -101,6 +101,7 @@ obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_TRACEPOINTS) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_IRQ_WORK) += irq_work.o +obj-$(CONFIG_CPU_PM) += cpu_pm.o obj-$(CONFIG_PERF_EVENTS) += events/ |