summaryrefslogtreecommitdiff
path: root/crypto/aes.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-17 08:51:31 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-17 08:51:31 +0400
commita2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch)
tree2def96ef17c0672c30f1a10287552978bf1d0b1c /crypto/aes.c
parentedb3366703224d5d8df573ae698ccd6b488dc743 (diff)
parent2ad56496627630ebc99f06af5f81ca23e17e014e (diff)
downloadlinux-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.tar.xz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'crypto/aes.c')
-rw-r--r--crypto/aes.c2
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 @@
/*
* #define byte(x, nr) ((unsigned char)((x) >> (nr*8)))
*/
-inline static u8
+static inline u8
byte(const u32 x, const unsigned n)
{
return x >> (n << 3);