diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /crypto | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'crypto')
| -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); |