add support for waldux

1 files changed, 148 insertions, 148 deletions

diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 964478607..368649293 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -3,13 +3,13 @@
 
 menu "Crypto support"
 
-config ADK_KERNEL_CRYPTO
+config ADK_LINUX_KERNEL_CRYPTO
 	tristate
 
-config ADK_KERNEL_CRYPTO_HW
+config ADK_LINUX_KERNEL_CRYPTO_HW
 	bool
 
-config ADK_KERNEL_XOR_BLOCKS
+config ADK_LINUX_KERNEL_XOR_BLOCKS
 	tristate
 
 comment "Hardware cryptography"
@@ -17,12 +17,12 @@ comment "Hardware cryptography"
 menu "Hardware crypto devices"
 depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_GEODE_CRYPTO
 
-config ADK_KERNEL_CRYPTO_DEV_GEODE
+config ADK_LINUX_KERNEL_CRYPTO_DEV_GEODE
 	tristate "Support for the Geode LX/GX AES engine"
-	select ADK_KERNEL_CRYPTO
-	select ADK_KERNEL_CRYPTO_HW
-	select ADK_KERNEL_CRYPTO_ECB
-	select ADK_KERNEL_CRYPTO_CBC
+	select ADK_LINUX_KERNEL_CRYPTO
+	select ADK_LINUX_KERNEL_CRYPTO_HW
+	select ADK_LINUX_KERNEL_CRYPTO_ECB
+	select ADK_LINUX_KERNEL_CRYPTO_CBC
 	depends on ADK_TARGET_WITH_GEODE_CRYPTO
 	default y if ADK_TARGET_WITH_GEODE_CRYPTO
 	default n
@@ -30,12 +30,12 @@ config ADK_KERNEL_CRYPTO_DEV_GEODE
 	  Say 'Y' here to use the AMD Geode LX processor on-board AES
 	  engine for the CryptoAPI AES algorithm.
 
-config ADK_KERNEL_CRYPTO_DEV_HIFN_795X
+config ADK_LINUX_KERNEL_CRYPTO_DEV_HIFN_795X
 	tristate "Driver for HIFN 795x crypto accelerator chips"
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
-	select ADK_KERNEL_CRYPTO
-	select ADK_KERNEL_CRYPTO_HW
-	select ADK_KERNEL_CRYPTO_DES
+	select ADK_LINUX_KERNEL_CRYPTO
+	select ADK_LINUX_KERNEL_CRYPTO_HW
+	select ADK_LINUX_KERNEL_CRYPTO_DES
 	default n
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.
@@ -46,98 +46,98 @@ comment "Software cryptography support"
 
 menu "Crypto core / Block and Hash modes"
 
-config ADK_KERNEL_CRYPTO_PCOMP
+config ADK_LINUX_KERNEL_CRYPTO_PCOMP
 	tristate
-	select ADK_KERNEL_CRYPTO_PCOMP2
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_PCOMP2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 
-config ADK_KERNEL_CRYPTO_PCOMP2
+config ADK_LINUX_KERNEL_CRYPTO_PCOMP2
 	tristate
-	select ADK_KERNEL_CRYPTO_ALGAPI2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 
-config ADK_KERNEL_CRYPTO_ALGAPI
+config ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	tristate
-	select ADK_KERNEL_CRYPTO_ALGAPI2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 	
-config ADK_KERNEL_CRYPTO_ALGAPI2
+config ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 	tristate
 
-config ADK_KERNEL_CRYPTO_AEAD
+config ADK_LINUX_KERNEL_CRYPTO_AEAD
 	tristate
-	select ADK_KERNEL_CRYPTO_AEAD2
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 
-config ADK_KERNEL_CRYPTO_AEAD2
+config ADK_LINUX_KERNEL_CRYPTO_AEAD2
 	tristate
-	select ADK_KERNEL_CRYPTO_ALGAPI2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 
-config ADK_KERNEL_CRYPTO_HASH
+config ADK_LINUX_KERNEL_CRYPTO_HASH
 	tristate
-	select ADK_KERNEL_CRYPTO
-	select ADK_KERNEL_CRYPTO_ALGAPI
-	select ADK_KERNEL_CRYPTO_HASH2
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_HASH2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 
-config ADK_KERNEL_CRYPTO_HASH2
-	select ADK_KERNEL_CRYPTO_ALGAPI2
+config ADK_LINUX_KERNEL_CRYPTO_HASH2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 	tristate
 
-config ADK_KERNEL_CRYPTO_BLKCIPHER
+config ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
 	tristate
-	select ADK_KERNEL_CRYPTO_BLKCIPHER2
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 
-config ADK_KERNEL_CRYPTO_BLKCIPHER2
+config ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER2
 	tristate
-	select ADK_KERNEL_CRYPTO_ALGAPI2
-	select ADK_KERNEL_CRYPTO_RNG2
-	select ADK_KERNEL_CRYPTO_WORKQUEUE
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
+	select ADK_LINUX_KERNEL_CRYPTO_RNG2
+	select ADK_LINUX_KERNEL_CRYPTO_WORKQUEUE
 
-config ADK_KERNEL_CRYPTO_WORKQUEUE
+config ADK_LINUX_KERNEL_CRYPTO_WORKQUEUE
 	tristate
 
-config ADK_KERNEL_CRYPTO_RNG
+config ADK_LINUX_KERNEL_CRYPTO_RNG
 	tristate
-	select ADK_KERNEL_CRYPTO_RNG2
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_RNG2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 
-config ADK_KERNEL_CRYPTO_RNG2
+config ADK_LINUX_KERNEL_CRYPTO_RNG2
 	tristate
-	select ADK_KERNEL_CRYPTO_ALGAPI2
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI2
 
 
-config ADK_KERNEL_CRYPTO_MANAGER
+config ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	tristate
-	select ADK_KERNEL_CRYPTO_MANAGER2
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER2
 
-config ADK_KERNEL_CRYPTO_MANAGER2
-	def_tristate ADK_KERNEL_CRYPTO_MANAGER || (ADK_KERNEL_CRYPTO_MANAGER!=n && ADK_KERNEL_CRYPTO_ALGAPI=y)
-	select ADK_KERNEL_CRYPTO_AEAD2
-	select ADK_KERNEL_CRYPTO_HASH2
-	select ADK_KERNEL_CRYPTO_BLKCIPHER2
-	select ADK_KERNEL_CRYPTO_PCOMP2
+config ADK_LINUX_KERNEL_CRYPTO_MANAGER2
+	def_tristate ADK_LINUX_KERNEL_CRYPTO_MANAGER || (ADK_LINUX_KERNEL_CRYPTO_MANAGER!=n && ADK_LINUX_KERNEL_CRYPTO_ALGAPI=y)
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD2
+	select ADK_LINUX_KERNEL_CRYPTO_HASH2
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER2
+	select ADK_LINUX_KERNEL_CRYPTO_PCOMP2
 
-config ADK_KERNEL_CRYPTO_AUTHENC
+config ADK_LINUX_KERNEL_CRYPTO_AUTHENC
 	tristate "AuthENC (IPsec)"
-	select ADK_KERNEL_CRYPTO_AEAD
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_MANAGER
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 
-config ADK_KERNEL_CRYPTO_SEQIV
+config ADK_LINUX_KERNEL_CRYPTO_SEQIV
 	tristate "Sequence Number IV Generator"
-	select ADK_KERNEL_CRYPTO_AEAD
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_RNG
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_RNG
 	default n
 	help
 	  This IV generator generates an IV based on a sequence number by
 	  xoring it with a salt.  This algorithm is mainly useful for CTR
 
-config ADK_KERNEL_CRYPTO_CTS
+config ADK_LINUX_KERNEL_CRYPTO_CTS
 	tristate "CTS support"
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
 	default n
 	help
           CTS: Cipher Text Stealing
@@ -147,67 +147,67 @@ config ADK_KERNEL_CRYPTO_CTS
           This mode is required for Kerberos gss mechanism support
           for AES encryption.
 
-config ADK_KERNEL_CRYPTO_CBC
+config ADK_LINUX_KERNEL_CRYPTO_CBC
 	tristate "CBC support"
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	default n
 	help
 	  CBC: Cipher Block Chaining mode
 	  This block cipher algorithm is required for IPSec.
 
-config ADK_KERNEL_CRYPTO_CCM
+config ADK_LINUX_KERNEL_CRYPTO_CCM
 	tristate "CCM support"
-	select ADK_KERNEL_CRYPTO_CTR
-	select ADK_KERNEL_CRYPTO_AEAD
+	select ADK_LINUX_KERNEL_CRYPTO_CTR
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD
 	default n
 	help
 	  Support for Counter with CBC MAC. Required for IPsec.
 
-config ADK_KERNEL_CRYPTO_GCM
+config ADK_LINUX_KERNEL_CRYPTO_GCM
 	tristate "GCM support"
-	select ADK_KERNEL_CRYPTO_CTR
-	select ADK_KERNEL_CRYPTO_AEAD
-	select ADK_KERNEL_CRYPTO_GHASH
-	select ADK_KERNEL_CRYPTO_NULL
+	select ADK_LINUX_KERNEL_CRYPTO_CTR
+	select ADK_LINUX_KERNEL_CRYPTO_AEAD
+	select ADK_LINUX_KERNEL_CRYPTO_GHASH
+	select ADK_LINUX_KERNEL_CRYPTO_NULL
 	default n
 	help
 	  Support for Galois/Counter Mode (GCM) and Galois Message
           Authentication Code (GMAC). Required for IPSec.
 
-config ADK_KERNEL_CRYPTO_CTR
+config ADK_LINUX_KERNEL_CRYPTO_CTR
 	tristate "CTR support"
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_SEQIV
-	select ADK_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_SEQIV
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	default n
 	help
 	  CTR: Counter mode
 	  This block cipher algorithm is required for IPSec.
 
-config ADK_KERNEL_CRYPTO_ECB
+config ADK_LINUX_KERNEL_CRYPTO_ECB
 	tristate "ECB support"
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	default n
 	help
 	  ECB: Electronic CodeBook mode
 	  This is the simplest block cipher algorithm.  It simply encrypts
 	  the input block by block.
 
-config ADK_KERNEL_CRYPTO_HMAC
+config ADK_LINUX_KERNEL_CRYPTO_HMAC
 	tristate "HMAC support"
-	select ADK_KERNEL_CRYPTO_HASH
-	select ADK_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	default n
 	help
 	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).
 	  This is required for IPSec.
 
-config ADK_KERNEL_CRYPTO_XCBC
+config ADK_LINUX_KERNEL_CRYPTO_XCBC
 	tristate "XCBC support"
-	select ADK_KERNEL_CRYPTO_HASH
-	select ADK_KERNEL_CRYPTO_MANAGER
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_MANAGER
 	default n
 	help
           XCBC: Keyed-Hashing with encryption algorithm
@@ -216,30 +216,30 @@ endmenu
 
 menu "Digest algorithms"
 
-config ADK_KERNEL_CRYPTO_MD4
+config ADK_LINUX_KERNEL_CRYPTO_MD4
 	tristate "MD4 digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  MD4 message digest algorithm (RFC1320).
 
-config ADK_KERNEL_CRYPTO_MD5
+config ADK_LINUX_KERNEL_CRYPTO_MD5
 	tristate "MD5 digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  MD5 message digest algorithm (RFC1321).
 
-config ADK_KERNEL_CRYPTO_SHA1
+config ADK_LINUX_KERNEL_CRYPTO_SHA1
 	tristate "SHA1 digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
-config ADK_KERNEL_CRYPTO_SHA256
+config ADK_LINUX_KERNEL_CRYPTO_SHA256
 	tristate "SHA256 digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  SHA256 secure hash standard (DFIPS 180-2).
@@ -247,9 +247,9 @@ config ADK_KERNEL_CRYPTO_SHA256
 	  This version of SHA implements a 256 bit hash with 128 bits of
 	  security against collision attacks.
 
-config ADK_KERNEL_CRYPTO_SHA512
+config ADK_LINUX_KERNEL_CRYPTO_SHA512
 	tristate "SHA512 digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  SHA512 secure hash standard (DFIPS 180-2).
@@ -260,9 +260,9 @@ config ADK_KERNEL_CRYPTO_SHA512
 	  This code also includes SHA-384, a 384 bit hash with 192 bits
 	  of security against collision attacks.
 
-config ADK_KERNEL_CRYPTO_WP512
+config ADK_LINUX_KERNEL_CRYPTO_WP512
 	tristate "Whirlpool digest algorithms"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  Whirlpool hash algorithm 512, 384 and 256-bit hashes
@@ -273,9 +273,9 @@ config ADK_KERNEL_CRYPTO_WP512
 	  See also:
 	  <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
-config ADK_KERNEL_CRYPTO_TGR192
+config ADK_LINUX_KERNEL_CRYPTO_TGR192
 	tristate "Tiger digest algorithms"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  Tiger hash algorithm 192, 160 and 128-bit hashes
@@ -290,9 +290,9 @@ endmenu
 
 menu "Cipher algoritms"
 
-config ADK_KERNEL_CRYPTO_AES
+config ADK_LINUX_KERNEL_CRYPTO_AES
 	tristate "AES cipher algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
@@ -311,11 +311,11 @@ config ADK_KERNEL_CRYPTO_AES
 
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
-config ADK_KERNEL_CRYPTO_AES_586
+config ADK_LINUX_KERNEL_CRYPTO_AES_586
 	tristate "AES cipher algorithms (i586)"
 	depends on ADK_x86
-	select ADK_KERNEL_CRYPTO_ALGAPI
-	select ADK_KERNEL_CRYPTO_AES
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_AES
 	default n
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
@@ -334,9 +334,9 @@ config ADK_KERNEL_CRYPTO_AES_586
 
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
-config ADK_KERNEL_CRYPTO_ANUBIS
+config ADK_LINUX_KERNEL_CRYPTO_ANUBIS
 	tristate "Anubis cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Anubis cipher algorithm.
@@ -349,9 +349,9 @@ config ADK_KERNEL_CRYPTO_ANUBIS
 	  <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
 	  <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
 
-config ADK_KERNEL_CRYPTO_ARC4
+config ADK_LINUX_KERNEL_CRYPTO_ARC4
 	tristate "ARC4 cipher algorithm"
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
 	default n
 	help
 	  ARC4 cipher algorithm.
@@ -361,9 +361,9 @@ config ADK_KERNEL_CRYPTO_ARC4
 	  WEP, but it should not be for other purposes because of the
 	  weakness of the algorithm.
 
-config ADK_KERNEL_CRYPTO_BLOWFISH
+config ADK_LINUX_KERNEL_CRYPTO_BLOWFISH
 	tristate "Blowfish cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Blowfish cipher algorithm, by Bruce Schneier.
@@ -375,9 +375,9 @@ config ADK_KERNEL_CRYPTO_BLOWFISH
 	  See also:
 	  <http://www.schneier.com/blowfish.html>
 
-config ADK_KERNEL_CRYPTO_CAMELLIA
+config ADK_LINUX_KERNEL_CRYPTO_CAMELLIA
 	tristate "Camellia cipher algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Camellia cipher algorithms module.
@@ -390,39 +390,39 @@ config ADK_KERNEL_CRYPTO_CAMELLIA
 	  See also:
 	  <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
-config ADK_KERNEL_CRYPTO_CAST5
+config ADK_LINUX_KERNEL_CRYPTO_CAST5
 	tristate "CAST5 (CAST-128) cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  The CAST5 encryption algorithm (synonymous with CAST-128) is
 	  described in RFC2144.
 
-config ADK_KERNEL_CRYPTO_CAST6
+config ADK_LINUX_KERNEL_CRYPTO_CAST6
 	tristate "CAST6 (CATS-256) cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  The CAST6 encryption algorithm (synonymous with CAST-256) is
 	  described in RFC2612.
 
-config ADK_KERNEL_CRYPTO_DES
+config ADK_LINUX_KERNEL_CRYPTO_DES
 	tristate "DES and Triple DES EDE cipher algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
-config ADK_KERNEL_CRYPTO_FCRYPT
+config ADK_LINUX_KERNEL_CRYPTO_FCRYPT
 	tristate "FCrypt cipher algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  FCrypt algorithm used by RxRPC.
 
-config ADK_KERNEL_CRYPTO_KHAZAD
+config ADK_LINUX_KERNEL_CRYPTO_KHAZAD
 	tristate "Khazad cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Khazad cipher algorithm.
@@ -434,9 +434,9 @@ config ADK_KERNEL_CRYPTO_KHAZAD
 	  See also:
 	  <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
 
-config ADK_KERNEL_CRYPTO_SERPENT
+config ADK_LINUX_KERNEL_CRYPTO_SERPENT
 	tristate "Serpent cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Serpent cipher algorithm, by Anderson, Biham & Knudsen.
@@ -448,9 +448,9 @@ config ADK_KERNEL_CRYPTO_SERPENT
 	  See also:
 	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
-config ADK_KERNEL_CRYPTO_TEA
+config ADK_LINUX_KERNEL_CRYPTO_TEA
 	tristate "TEA, XTEA and XETA cipher algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  TEA cipher algorithm.
@@ -466,9 +466,9 @@ config ADK_KERNEL_CRYPTO_TEA
 	  Xtendend Encryption Tiny Algorithm is a mis-implementation 
 	  of the XTEA algorithm for compatibility purposes.
 
-config ADK_KERNEL_CRYPTO_TWOFISH
+config ADK_LINUX_KERNEL_CRYPTO_TWOFISH
 	tristate "Twofish cipher algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  Twofish cipher algorithm.
@@ -481,9 +481,9 @@ config ADK_KERNEL_CRYPTO_TWOFISH
 	  See also:
 	  <http://www.schneier.com/twofish.html>
 
-config ADK_KERNEL_CRYPTO_TWOFISH_586
+config ADK_LINUX_KERNEL_CRYPTO_TWOFISH_586
 	tristate "Twofish cipher algorithm (i586)"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	depends on ADK_x86
 	default n
 	help
@@ -497,11 +497,11 @@ config ADK_KERNEL_CRYPTO_TWOFISH_586
 	  See also:
 	  <http://www.schneier.com/twofish.html>
 
-config ADK_KERNEL_CRYPTO_NULL
+config ADK_LINUX_KERNEL_CRYPTO_NULL
 	tristate "Null algorithms"
-	select ADK_KERNEL_CRYPTO_ALGAPI
-	select ADK_KERNEL_CRYPTO_BLKCIPHER
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_BLKCIPHER
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  These are 'Null' algorithms, used by IPsec, which do nothing.
@@ -510,11 +510,11 @@ endmenu
 
 menu "Compression"
 
-config ADK_KERNEL_CRYPTO_DEFLATE
+config ADK_LINUX_KERNEL_CRYPTO_DEFLATE
 	tristate "Deflate compression algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
-	select ADK_KERNEL_ZLIB_DEFLATE
-	select ADK_KERNEL_ZLIB_INFLATE
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_ZLIB_DEFLATE
+	select ADK_LINUX_KERNEL_ZLIB_INFLATE
 	default n
 	help
 	  This is the Deflate algorithm (RFC1951), specified for use in
@@ -522,15 +522,15 @@ config ADK_KERNEL_CRYPTO_DEFLATE
 	  
 	  You will most probably want this if using IPSec.
 
-config ADK_KERNEL_CRYPTO_LZO
+config ADK_LINUX_KERNEL_CRYPTO_LZO
 	tristate "LZO compression algorithm"
-	select ADK_KERNEL_CRYPTO_ALGAPI
+	select ADK_LINUX_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 
-config ADK_KERNEL_CRYPTO_MICHAEL_MIC
+config ADK_LINUX_KERNEL_CRYPTO_MICHAEL_MIC
 	tristate "Michael MIC keyed digest algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  Michael MIC is used for message integrity protection in TKIP
@@ -538,10 +538,10 @@ config ADK_KERNEL_CRYPTO_MICHAEL_MIC
 	  should not be used for other purposes because of the weakness
 	  of the algorithm.
 
-config ADK_KERNEL_CRYPTO_CRC32C
+config ADK_LINUX_KERNEL_CRYPTO_CRC32C
 	tristate "CRC32c CRC algorithm"
-	select ADK_KERNEL_CRYPTO_HASH
-	select ADK_KERNEL_CRC32
+	select ADK_LINUX_KERNEL_CRYPTO_HASH
+	select ADK_LINUX_KERNEL_CRC32
 	default n
 	help
 	  Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used