diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 15:27:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 15:27:44 -0500 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /fs/isofs/namei.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'fs/isofs/namei.c')
| -rw-r--r-- | fs/isofs/namei.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index 9569fc44102..690edf37173 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c @@ -6,20 +6,9 @@ * (C) 1991 Linus Torvalds - minix filesystem */ -#include <linux/time.h> -#include <linux/iso_fs.h> -#include <linux/kernel.h> -#include <linux/string.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/mm.h> -#include <linux/errno.h> #include <linux/config.h> /* Joliet? */ #include <linux/smp_lock.h> -#include <linux/buffer_head.h> -#include <linux/dcache.h> - -#include <asm/uaccess.h> +#include "isofs.h" /* * ok, we cannot use strncmp, as the name is not in our data space. |