diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /fs/isofs/dir.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'fs/isofs/dir.c')
| -rw-r--r-- | fs/isofs/dir.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 14d86de6637d..6030956b894b 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
| @@ -10,20 +10,9 @@ | |||
| 10 | * | 10 | * |
| 11 | * isofs directory handling functions | 11 | * isofs directory handling functions |
| 12 | */ | 12 | */ |
| 13 | #include <linux/errno.h> | ||
| 14 | #include <linux/fs.h> | ||
| 15 | #include <linux/iso_fs.h> | ||
| 16 | #include <linux/kernel.h> | ||
| 17 | #include <linux/stat.h> | ||
| 18 | #include <linux/string.h> | ||
| 19 | #include <linux/mm.h> | ||
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/time.h> | ||
| 22 | #include <linux/config.h> | 13 | #include <linux/config.h> |
| 23 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
| 24 | #include <linux/buffer_head.h> | 15 | #include "isofs.h" |
| 25 | |||
| 26 | #include <asm/uaccess.h> | ||
| 27 | 16 | ||
| 28 | static int isofs_readdir(struct file *, void *, filldir_t); | 17 | static int isofs_readdir(struct file *, void *, filldir_t); |
| 29 | 18 | ||