diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /crypto/Kconfig | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index c442f2e7ce46..ba133d557045 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -337,7 +337,7 @@ config CRYPTO_CRC32C | |||
| 337 | 337 | ||
| 338 | config CRYPTO_TEST | 338 | config CRYPTO_TEST |
| 339 | tristate "Testing module" | 339 | tristate "Testing module" |
| 340 | depends on CRYPTO | 340 | depends on CRYPTO && m |
| 341 | help | 341 | help |
| 342 | Quick & dirty crypto test module. | 342 | Quick & dirty crypto test module. |
| 343 | 343 | ||