diff options
| author | Paul Mundt | 2012-01-12 04:57:32 +0100 |
|---|---|---|
| committer | Paul Mundt | 2012-01-12 04:57:32 +0100 |
| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /drivers/sh | |
| parent | sh: add a resource name for shdma (diff) | |
| parent | sh: also without PM_RUNTIME pm_runtime.o must be built (diff) | |
| download | kernel-qcow2-linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.gz kernel-qcow2-linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.xz kernel-qcow2-linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.zip | |
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 'drivers/sh')
| -rw-r--r-- | drivers/sh/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 67e272ab1623..7139ad2f2086 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile @@ -7,11 +7,4 @@ obj-$(CONFIG_HAVE_CLK) += clk/ obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_SUPERHYWAY) += superhyway/ obj-$(CONFIG_GENERIC_GPIO) += pfc.o - -# -# For the moment we only use this framework for ARM-based SH/R-Mobile -# platforms and generic SH. SH-based SH-Mobile platforms are still using -# an older framework that is pending up-porting, at which point this -# special casing can go away. -# -obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE) += pm_runtime.o +obj-y += pm_runtime.o |