diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-17 07:58:25 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-17 07:58:25 (GMT) |
| commit | bb3c3e807140816b5f5fd4840473ee52a916ad4f (patch) | |
| tree | 9e8a69d266a7df86ca16177eefffab4b4e910753 /crypto/async_tx/Kconfig | |
| parent | 595c36490deb49381dc51231a3d5e6b66786ed27 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | linux-bb3c3e807140816b5f5fd4840473ee52a916ad4f.tar.xz | |
Merge commit 'v2.6.32-rc5' into perf/probes
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'crypto/async_tx/Kconfig')
| -rw-r--r-- | crypto/async_tx/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/async_tx/Kconfig b/crypto/async_tx/Kconfig index d8fb3914..e5aeb2b 100644 --- a/crypto/async_tx/Kconfig +++ b/crypto/async_tx/Kconfig @@ -14,3 +14,12 @@ config ASYNC_MEMSET tristate select ASYNC_CORE +config ASYNC_PQ + tristate + select ASYNC_CORE + +config ASYNC_RAID6_RECOV + tristate + select ASYNC_CORE + select ASYNC_PQ + |