diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
| commit | c3144fc46f987413df10e83659f0bf1aad76f79e (patch) | |
| tree | a09f3c13c32664a617d3981ae111436c3127ccc3 /arch/sh/kernel/cpu/shmobile/Makefile | |
| parent | 4f896ffca2b72f4b719746e7fbb0b623252e6ac9 (diff) | |
| parent | cc58f597afc63a57bb55ed97c2a72f7405320c93 (diff) | |
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
Diffstat (limited to 'arch/sh/kernel/cpu/shmobile/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile index e8a5111e848a..a39f88ea1a85 100644 --- a/arch/sh/kernel/cpu/shmobile/Makefile +++ b/arch/sh/kernel/cpu/shmobile/Makefile | |||
| @@ -5,3 +5,4 @@ | |||
| 5 | # Power Management & Sleep mode | 5 | # Power Management & Sleep mode |
| 6 | obj-$(CONFIG_PM) += pm.o sleep.o | 6 | obj-$(CONFIG_PM) += pm.o sleep.o |
| 7 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 7 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
| 8 | obj-$(CONFIG_PM_RUNTIME) += pm_runtime.o | ||