diff --git a/[refs] b/[refs]
index af96b7aa7b24..64c94d471ac9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1cda4e39638e906f022c8ce56f566b617e1f77e
+refs/heads/master: 214dc54f6f1b71bcd895ef272c108c67ef046200
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
index 93ad53a84e95..c3166a1a5bb6 100644
--- a/trunk/crypto/Kconfig
+++ b/trunk/crypto/Kconfig
@@ -494,7 +494,6 @@ config CRYPTO_SALSA20_586
 	depends on (X86 || UML_X86) && !64BIT
 	depends on EXPERIMENTAL
 	select CRYPTO_BLKCIPHER
-	select CRYPTO_SALSA20
 	help
 	  Salsa20 stream cipher algorithm.
 
@@ -509,7 +508,6 @@ config CRYPTO_SALSA20_X86_64
 	depends on (X86 || UML_X86) && 64BIT
 	depends on EXPERIMENTAL
 	select CRYPTO_BLKCIPHER
-	select CRYPTO_SALSA20
 	help
 	  Salsa20 stream cipher algorithm.