Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 447d8e68887a1f668312806e8cedd75c8c218247..fc2d744a4e4a75e3960589df663a84650c9a85b7 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/