diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /arch/sh/kernel/cpu/shmobile/Makefile | |
| parent | a4d5247310c993b6b30f1686be12ddacfc41142a (diff) | |
| parent | d3442b2bb7ce4089fadcf483b8ae9766ab480238 (diff) | |
| download | linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.bz2 | |
Merge branch 'sh/pm-runtime' into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/shmobile/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile index a39f88ea1a85..e8a5111e848a 100644 --- a/arch/sh/kernel/cpu/shmobile/Makefile +++ b/arch/sh/kernel/cpu/shmobile/Makefile @@ -5,4 +5,3 @@ # Power Management & Sleep mode obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_PM_RUNTIME) += pm_runtime.o |