diff options
author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
---|---|---|
committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /crypto/aes.c | |
parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'crypto/aes.c')
-rw-r--r-- | crypto/aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/aes.c b/crypto/aes.c index d0dd7c3c5278..5df92888ef5a 100644 --- a/crypto/aes.c +++ b/crypto/aes.c | |||
@@ -67,7 +67,7 @@ | |||
67 | /* | 67 | /* |
68 | * #define byte(x, nr) ((unsigned char)((x) >> (nr*8))) | 68 | * #define byte(x, nr) ((unsigned char)((x) >> (nr*8))) |
69 | */ | 69 | */ |
70 | inline static u8 | 70 | static inline u8 |
71 | byte(const u32 x, const unsigned n) | 71 | byte(const u32 x, const unsigned n) |
72 | { | 72 | { |
73 | return x >> (n << 3); | 73 | return x >> (n << 3); |