diff options
author | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
---|---|---|
committer | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /fs/xfs | |
parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_iomap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 5c6d873e292c..788917f355c4 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include "xfs_ialloc.h" | 40 | #include "xfs_ialloc.h" |
41 | #include "xfs_btree.h" | 41 | #include "xfs_btree.h" |
42 | #include "xfs_bmap.h" | 42 | #include "xfs_bmap.h" |
43 | #include "xfs_bit.h" | ||
44 | #include "xfs_rtalloc.h" | 43 | #include "xfs_rtalloc.h" |
45 | #include "xfs_error.h" | 44 | #include "xfs_error.h" |
46 | #include "xfs_itable.h" | 45 | #include "xfs_itable.h" |