diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-11 15:43:16 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-11 15:43:49 +0400 |
commit | 998052b74574699bdd1e451b6556e4d7667a7a4e (patch) | |
tree | 3124898e873cdec28f724106e60d1bff760505f1 /arch/powerpc/Kconfig | |
parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
download | linux-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.xz |
Merge branch 'for-linus' into for-next
Merging for-linus branch for syncing the latest STAC/IDT codec
changes to be affected by the upcoming hda-jack rewrites.
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a577609f8ed6..4bc7b62fb4b6 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -399,8 +399,6 @@ config PPC64_SUPPORTS_MEMORY_FAILURE config KEXEC bool "kexec system call" depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) - select CRYPTO - select CRYPTO_SHA256 help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot |