Merge git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest

[deliverable/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index f3ebb30f1b7fd9c7ed93d6328dbe4d8c54b1fd87..bf15ce7493d274eee5b135ea194106da84db2864 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -115,3 +115,5 @@ obj-$(CONFIG_VLYNQ)         += vlynq/
 obj-$(CONFIG_STAGING)          += staging/
 obj-y                          += platform/
 obj-y                          += ieee802154/
+#common clk code
+obj-y                          += clk/