summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/geode-aes.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 08:44:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-24 08:44:44 -0700
commit900f1d2c87738919986c6de606336057674c8c1e (patch)
tree5bcf24c6facda1229cf87067bb5e30350ce13ec9 /drivers/crypto/geode-aes.h
parent5270f2901d6ba38724d0e9e4b637e660f1ca85f7 (diff)
parent761e784673d79c8ea9befdad31e30c65e0d20b82 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] geode: Fix in-place operations and set key
Diffstat (limited to 'drivers/crypto/geode-aes.h')
-rw-r--r--drivers/crypto/geode-aes.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index 8003a36f3a8..f47968671ae 100644
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -20,8 +20,7 @@
#define AES_DIR_DECRYPT 0
#define AES_DIR_ENCRYPT 1
-#define AES_FLAGS_USRKEY (1 << 0)
-#define AES_FLAGS_COHERENT (1 << 1)
+#define AES_FLAGS_HIDDENKEY (1 << 0)
struct geode_aes_op {