Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index b14706a..615cd9a 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -228,10 +228,10 @@ const struct reiserfs_key MIN_KEY = { 0, 0, {{0, 0},} };
 
 /* Maximal possible key. It is never in the tree. */
 static const struct reiserfs_key MAX_KEY = {
-       __constant_cpu_to_le32(0xffffffff),
-       __constant_cpu_to_le32(0xffffffff),
-       {{__constant_cpu_to_le32(0xffffffff),
-         __constant_cpu_to_le32(0xffffffff)},}
+       cpu_to_le32(0xffffffff),
+       cpu_to_le32(0xffffffff),
+       {{cpu_to_le32(0xffffffff),
+         cpu_to_le32(0xffffffff)},}
 };
 
 /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom