Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[karo-tx-linux.git] / drivers / sh / Makefile

diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 4956bf1f2134a08c2545b532f05ef355452e21b6..78bb5127abd0a58bf06a3ac3588e7868d791ece0 100644 (file)
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -4,4 +4,6 @@
 obj-$(CONFIG_SUPERHYWAY)       += superhyway/
 obj-$(CONFIG_MAPLE)            += maple/
 obj-$(CONFIG_GENERIC_GPIO)     += pfc.o
+obj-$(CONFIG_SUPERH)           += clk.o
+obj-$(CONFIG_SH_CLK_CPG)       += clk-cpg.o
 obj-y                          += intc.o