Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[safe/jmp/linux-2.6] / fs / befs / super.c

diff --git a/fs/befs/super.c b/fs/befs/super.c
index 4557acb..ca40f82 100644 (file)
--- a/fs/befs/super.c
+++ b/fs/befs/super.c
@@ -8,10 +8,10 @@
  */
 
 #include <linux/fs.h>
+#include <asm/page.h> /* for PAGE_SIZE */
 
 #include "befs.h"
 #include "super.h"
-#include "endian.h"
 
 /**
  * load_befs_sb -- Read from disk and properly byteswap all the fields
@@ -27,10 +27,10 @@ befs_load_sb(struct super_block *sb, befs_super_block * disk_sb)
        befs_sb_info *befs_sb = BEFS_SB(sb);
 
        /* Check the byte order of the filesystem */
-       if (le32_to_cpu(disk_sb->fs_byte_order) == BEFS_BYTEORDER_NATIVE)
+       if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE)
            befs_sb->byte_order = BEFS_BYTESEX_LE;
-       else if (be32_to_cpu(disk_sb->fs_byte_order) == BEFS_BYTEORDER_NATIVE)
-           befs_sb->byte_order = BEFS_BYTESEX_BE;      
+       else if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_BE)
+           befs_sb->byte_order = BEFS_BYTESEX_BE;
 
        befs_sb->magic1 = fs32_to_cpu(sb, disk_sb->magic1);
        befs_sb->magic2 = fs32_to_cpu(sb, disk_sb->magic2);