diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /fs/reiserfs/xattr.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'fs/reiserfs/xattr.c')
| -rw-r--r-- | fs/reiserfs/xattr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index e386d3db3051..87ac9dc8b381 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/xattr.h> | 39 | #include <linux/xattr.h> |
| 40 | #include <linux/reiserfs_xattr.h> | 40 | #include <linux/reiserfs_xattr.h> |
| 41 | #include <linux/reiserfs_acl.h> | 41 | #include <linux/reiserfs_acl.h> |
| 42 | #include <linux/mbcache.h> | ||
| 43 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 44 | #include <asm/checksum.h> | 43 | #include <asm/checksum.h> |
| 45 | #include <linux/smp_lock.h> | 44 | #include <linux/smp_lock.h> |