diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /fs/ufs/file.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/ufs/file.c')
| -rw-r--r-- | fs/ufs/file.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index ed69d7fe1b5d..62ad481810ef 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c | |||
| @@ -23,18 +23,8 @@ | |||
| 23 | * ext2 fs regular file handling primitives | 23 | * ext2 fs regular file handling primitives |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <asm/uaccess.h> | ||
| 27 | #include <asm/system.h> | ||
| 28 | |||
| 29 | #include <linux/errno.h> | ||
| 30 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
| 31 | #include <linux/ufs_fs.h> | 27 | #include <linux/ufs_fs.h> |
| 32 | #include <linux/fcntl.h> | ||
| 33 | #include <linux/time.h> | ||
| 34 | #include <linux/stat.h> | ||
| 35 | #include <linux/mm.h> | ||
| 36 | #include <linux/pagemap.h> | ||
| 37 | #include <linux/smp_lock.h> | ||
| 38 | 28 | ||
| 39 | /* | 29 | /* |
| 40 | * We have mostly NULL's here: the current defaults are ok for | 30 | * We have mostly NULL's here: the current defaults are ok for |