Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[mv-sheeva.git] / fs / jfs / endian24.h

diff --git a/fs/jfs/endian24.h b/fs/jfs/endian24.h
index 79494c4f2b10c2601c20044085d10815661d34a9..fa92f7f1d0d0d709d0edeb910dd95bf3bcd8bcee 100644 (file)
--- a/fs/jfs/endian24.h
+++ b/fs/jfs/endian24.h
@@ -29,7 +29,7 @@
        __u32 __x = (x); \
        ((__u32)( \
                ((__x & (__u32)0x000000ffUL) << 16) | \
-                (__x & (__u32)0x0000ff00UL)        | \
+                (__x & (__u32)0x0000ff00UL)        | \
                ((__x & (__u32)0x00ff0000UL) >> 16) )); \
 })