Merge tag 'v3.11-rc7' into devicetree/next

Linux 3.11-rc7

1 files changed, 0 insertions, 19 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 69ce573f1224..aca01164f002 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -376,25 +376,6 @@ config CRYPTO_CRC32_PCLMUL
           which will enable any routine to use the CRC-32-IEEE 802.3 checksum
           and gain better performance as compared with the table implementation.
 
-config CRYPTO_CRCT10DIF
-        tristate "CRCT10DIF algorithm"
-        select CRYPTO_HASH
-        help
-          CRC T10 Data Integrity Field computation is being cast as
-          a crypto transform.  This allows for faster crc t10 diff
-          transforms to be used if they are available.
-
-config CRYPTO_CRCT10DIF_PCLMUL
-        tristate "CRCT10DIF PCLMULQDQ hardware acceleration"
-        depends on X86 && 64BIT && CRC_T10DIF
-        select CRYPTO_HASH
-        help
-          For x86_64 processors with SSE4.2 and PCLMULQDQ supported,
-          CRC T10 DIF PCLMULQDQ computation can be hardware
-          accelerated PCLMULQDQ instruction. This option will create
-          'crct10dif-plcmul' module, which is faster when computing the
-          crct10dif checksum as compared with the generic table implementation.
-
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
         select CRYPTO_GF128MUL