Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

[linux-2.6] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 447d8e6..fc2d744 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -74,3 +74,5 @@ obj-$(CONFIG_SGI_SN)          += sn/
 obj-y                          += firmware/
 obj-$(CONFIG_CRYPTO)           += crypto/
 obj-$(CONFIG_SUPERH)           += sh/
+obj-$(CONFIG_GENERIC_TIME)     += clocksource/
+obj-$(CONFIG_DMA_ENGINE)       += dma/