summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 12:57:32 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 12:57:32 +0900
commit9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch)
treec33b3b3e5dc32a1211bd8c99a4eed3752c05108b /drivers/sh
parenta4d5247310c993b6b30f1686be12ddacfc41142a (diff)
parentd3442b2bb7ce4089fadcf483b8ae9766ab480238 (diff)
downloadlinux-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 'drivers/sh')
-rw-r--r--drivers/sh/Makefile9
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