diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-05-28 13:00:14 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-29 09:08:23 -0400 |
| commit | 2e2d663d2dd64ffe9855be0b35aa221c9b8139f2 (patch) | |
| tree | 508667aa6fbab564e7875d3953671265d0176e69 /arch/mips/kernel/Makefile | |
| parent | 5ec79bf919ddb53fd98893b7217897c839aa19cc (diff) | |
| parent | 322014531e1fac4674b8eef67e4f80aca1e9f003 (diff) | |
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 | |||
| 105 | obj-$(CONFIG_MIPS_CM) += mips-cm.o | 105 | obj-$(CONFIG_MIPS_CM) += mips-cm.o |
| 106 | obj-$(CONFIG_MIPS_CPC) += mips-cpc.o | 106 | obj-$(CONFIG_MIPS_CPC) += mips-cpc.o |
| 107 | 107 | ||
| 108 | obj-$(CONFIG_CPU_PM) += pm.o | ||
| 109 | obj-$(CONFIG_MIPS_CPS_PM) += pm-cps.o | ||
| 110 | |||
| 108 | # | 111 | # |
| 109 | # DSP ASE supported for MIPS32 or MIPS64 Release 2 cores only. It is not | 112 | # DSP ASE supported for MIPS32 or MIPS64 Release 2 cores only. It is not |
| 110 | # safe to unconditionnaly use the assembler -mdsp / -mdspr2 switches | 113 | # safe to unconditionnaly use the assembler -mdsp / -mdspr2 switches |