Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[pandora-kernel.git] / drivers / sh / Makefile

diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 08fc653..24e6cec 100644 (file)
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -1,10 +1,9 @@
 #
 # Makefile for the SuperH specific drivers.
 #
-obj-y  := clk.o intc.o
+obj-y  := intc/
 
-obj-$(CONFIG_SUPERHYWAY)       += superhyway/
+obj-$(CONFIG_HAVE_CLK)         += clk/
 obj-$(CONFIG_MAPLE)            += maple/
-
+obj-$(CONFIG_SUPERHYWAY)       += superhyway/
 obj-$(CONFIG_GENERIC_GPIO)     += pfc.o
-obj-$(CONFIG_SH_CLK_CPG)       += clk-cpg.o