diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
| commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
| tree | b3ff509f21352ef053cb3d490cb13528090d32ac /crypto/aes.c | |
| parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
| parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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); |