diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 16:09:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 16:09:16 -0400 |
| commit | 71d441ddb51941d9d8279bdc858f965711b85c14 (patch) | |
| tree | c413042b19bb0302eabcbc89febe051f58186477 /fs/jfs/endian24.h | |
| parent | c31f2e8a42c41efa46397732656ddf48cc77593e (diff) | |
| parent | 288e4d838d1e999c0515f85a337cacb2be233071 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: Update print_hex_dump() syntax
JFS: use print_hex_dump() rather than private dump_mem() function
JFS: Whitespace cleanup and remove some dead code
Diffstat (limited to 'fs/jfs/endian24.h')
| -rw-r--r-- | fs/jfs/endian24.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/endian24.h b/fs/jfs/endian24.h index 79494c4f2b10..fa92f7f1d0d0 100644 --- a/fs/jfs/endian24.h +++ b/fs/jfs/endian24.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | __u32 __x = (x); \ | 29 | __u32 __x = (x); \ |
| 30 | ((__u32)( \ | 30 | ((__u32)( \ |
| 31 | ((__x & (__u32)0x000000ffUL) << 16) | \ | 31 | ((__x & (__u32)0x000000ffUL) << 16) | \ |
| 32 | (__x & (__u32)0x0000ff00UL) | \ | 32 | (__x & (__u32)0x0000ff00UL) | \ |
| 33 | ((__x & (__u32)0x00ff0000UL) >> 16) )); \ | 33 | ((__x & (__u32)0x00ff0000UL) >> 16) )); \ |
| 34 | }) | 34 | }) |
| 35 | 35 | ||