diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 09:39:08 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 09:39:08 -0500 |
| commit | 74293759002aa7db0179158c20676a034614577b (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /fs/jfs/jfs_lock.h | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
Merge branch 'master' of /home/aia21/ntfs-2.6/
Diffstat (limited to 'fs/jfs/jfs_lock.h')
| -rw-r--r-- | fs/jfs/jfs_lock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_lock.h b/fs/jfs/jfs_lock.h index 10ad1d086685..70ac9f7d1e00 100644 --- a/fs/jfs/jfs_lock.h +++ b/fs/jfs/jfs_lock.h | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #define _H_JFS_LOCK | 20 | #define _H_JFS_LOCK |
| 21 | 21 | ||
| 22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 23 | #include <linux/mutex.h> | ||
| 23 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 24 | 25 | ||
| 25 | /* | 26 | /* |