Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[mv-sheeva.git] / fs / ocfs2 / endian.h

diff --git a/fs/ocfs2/endian.h b/fs/ocfs2/endian.h
index f226b22076288651287619aa3bbbd330f11320df..1942e09f6ee588fc153ce696cb14d76a7a6c39d1 100644 (file)
--- a/fs/ocfs2/endian.h
+++ b/fs/ocfs2/endian.h
@@ -32,9 +32,9 @@ static inline void le32_add_cpu(__le32 *var, u32 val)
        *var = cpu_to_le32(le32_to_cpu(*var) + val);
 }
 
-static inline void le32_and_cpu(__le32 *var, u32 val)
+static inline void le64_add_cpu(__le64 *var, u64 val)
 {
-       *var = cpu_to_le32(le32_to_cpu(*var) & val);
+       *var = cpu_to_le64(le64_to_cpu(*var) + val);
 }
 
 static inline void be32_add_cpu(__be32 *var, u32 val)