diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 22:17:44 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 22:17:44 -0500 |
| commit | 5123bc35d2bd2e5c344a53e634edec2cd0861a0e (patch) | |
| tree | 86f56040b6a8d394c30b7f6bc48d9c001851c2b2 /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (diff) | |
| parent | 27174203f570b923e5c02c618a5557295bab8755 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index fc8d776ba05..f65a53f8752 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h @@ -38,7 +38,6 @@ #include <kmem.h> #include <mrlock.h> #include <sv.h> -#include <mutex.h> #include <time.h> #include <support/ktrace.h> @@ -51,6 +50,7 @@ #include <linux/blkdev.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/file.h> #include <linux/swap.h> #include <linux/errno.h> |