diff options
| author | Ralf Baechle | 2014-05-28 19:00:14 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2014-05-29 15:08:23 +0200 |
| commit | 2e2d663d2dd64ffe9855be0b35aa221c9b8139f2 (patch) | |
| tree | 508667aa6fbab564e7875d3953671265d0176e69 /arch/mips/kernel/Makefile | |
| parent | MIPS: SNI: Remove USE_GENERIC_EARLY_PRINTK_8250 (diff) | |
| parent | MIPS: Malta: CPS SMP by default (diff) | |
| download | kernel-qcow2-linux-2e2d663d2dd64ffe9855be0b35aa221c9b8139f2.tar.gz kernel-qcow2-linux-2e2d663d2dd64ffe9855be0b35aa221c9b8139f2.tar.xz kernel-qcow2-linux-2e2d663d2dd64ffe9855be0b35aa221c9b8139f2.zip | |
Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/Makefile')
| -rw-r--r-- | arch/mips/kernel/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 8f8b531bc848..a61d108f4c0e 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -105,6 +105,9 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_MIPS_CM) += mips-cm.o obj-$(CONFIG_MIPS_CPC) += mips-cpc.o +obj-$(CONFIG_CPU_PM) += pm.o +obj-$(CONFIG_MIPS_CPS_PM) += pm-cps.o + # # DSP ASE supported for MIPS32 or MIPS64 Release 2 cores only. It is not # safe to unconditionnaly use the assembler -mdsp / -mdspr2 switches |