Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[deliverable/linux.git] / drivers / sh / Makefile

diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 67e272ab162310645f0c3339c7cd29987f3b4dd8..e57895b1a425ca7e5b8d14e587204fdd5ef70ef2 100644 (file)
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -5,13 +5,7 @@ obj-y  := intc/
 
 obj-$(CONFIG_HAVE_CLK)         += clk/
 obj-$(CONFIG_MAPLE)            += maple/
+obj-$(CONFIG_SH_PFC)           += pfc/
 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