diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-11 09:33:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-11 09:33:12 +0200 |
| commit | 3d2f4d0c0d4f3b676ecca504a3916b8e9843a181 (patch) | |
| tree | f72e05df59734bb1deeba510283072e16c056640 /crypto/Kconfig | |
| parent | ALSA: hda - Skip Realtek SKU check for Lenovo machines (diff) | |
| parent | ALSA: hda - Fix headset mic detection problem for several Dell laptops (diff) | |
| download | linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.xz linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.zip | |
Merge branch 'for-linus' into for-next
Back-merge from for-linus just to make the further development easier.
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 a9377bef25e3..84d71482bf08 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -439,7 +439,7 @@ config CRYPTO_CRC32C_INTEL config CRYPT_CRC32C_VPMSUM tristate "CRC32c CRC algorithm (powerpc64)" - depends on PPC64 + depends on PPC64 && ALTIVEC select CRYPTO_HASH select CRC32 help |