diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 00:42:29 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 00:42:29 (GMT) |
| commit | f9dd2134374c8de6b911e2b8652c6c9622eaa658 (patch) | |
| tree | c1b8f8d622941606b9e7247ab31d811ba4295011 /crypto/async_tx/Makefile | |
| parent | 4b652f0db3be891c7b76b109c3b55003b920fc96 (diff) | |
| parent | 07a3b417dc3d00802bd7b4874c3e811f0b015a7d (diff) | |
| download | linux-fsl-qoriq-f9dd2134374c8de6b911e2b8652c6c9622eaa658.tar.xz | |
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts:
include/linux/dmaengine.h
Diffstat (limited to 'crypto/async_tx/Makefile')
| -rw-r--r-- | crypto/async_tx/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/async_tx/Makefile b/crypto/async_tx/Makefile index 27baa7d..d1e0e6f 100644 --- a/crypto/async_tx/Makefile +++ b/crypto/async_tx/Makefile @@ -2,3 +2,6 @@ obj-$(CONFIG_ASYNC_CORE) += async_tx.o obj-$(CONFIG_ASYNC_MEMCPY) += async_memcpy.o obj-$(CONFIG_ASYNC_MEMSET) += async_memset.o obj-$(CONFIG_ASYNC_XOR) += async_xor.o +obj-$(CONFIG_ASYNC_PQ) += async_pq.o +obj-$(CONFIG_ASYNC_RAID6_RECOV) += async_raid6_recov.o +obj-$(CONFIG_ASYNC_RAID6_TEST) += raid6test.o |