Merge bk://are.twiddle.net/tga-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://are.twiddle.net/tga-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
ce17d12e · Linus Torvalds · 14806dfc · 17edb896 · ce17d12e · ce17d12e
Commit ce17d12e authored Jan 01, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

fs/befs/linuxvfs.c fs/befs/linuxvfs.c +1 -1

fs/romfs/inode.c fs/romfs/inode.c +1 -0

No files found.
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -12,7 +12,7 @@
 #include <linux/stat.h>
 #include <linux/nls.h>
 #include <linux/buffer_head.h>
-#include <linux/statfs.h>
+#include <linux/vfs.h>

 #include "befs.h"
 #include "btree.h"

--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -74,6 +74,7 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
+#include <linux/vfs.h>

 #include <asm/uaccess.h>