Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 68e934b4bee2ddc0ffb4e860a16c129fb79aec1c..0cf17f1ea1513a17ee828d53bea6bd09b56e27d0 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -55,4 +55,4 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
 # generic algorithms and the async_tx api
 #
 obj-$(CONFIG_XOR_BLOCKS) += xor.o
-
+obj-$(CONFIG_ASYNC_CORE) += async_tx/