Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / fs / adfs / map.c

diff --git a/fs/adfs/map.c b/fs/adfs/map.c
index 92ab4fbc2031f6eaaff492954e84fb3d4ca93957..d1a5932bb0f183c63d855f48c91cceac4b3662ca 100644 (file)
--- a/fs/adfs/map.c
+++ b/fs/adfs/map.c
@@ -7,14 +7,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/adfs_fs.h>
-#include <linux/spinlock.h>
 #include <linux/buffer_head.h>
-
 #include <asm/unaligned.h>
-
 #include "adfs.h"
 
 /*
@@ -62,7 +56,7 @@ static DEFINE_RWLOCK(adfs_map_lock);
 #define GET_FRAG_ID(_map,_start,_idmask)                               \
        ({                                                              \
                unsigned char *_m = _map + (_start >> 3);               \
-               u32 _frag = get_unaligned((u32 *)_m);                   \
+               u32 _frag = get_unaligned_le32(_m);                     \
                _frag >>= (_start & 7);                                 \
                _frag & _idmask;                                        \
        })