summaryrefslogtreecommitdiffstats
path: root/fs/minix
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /fs/minix
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'fs/minix')
-rw-r--r--fs/minix/file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/minix/file.c b/fs/minix/file.c
index 14d478bde..9eab1fb17 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -7,7 +7,6 @@
*/
#include <linux/sched.h>
-#include <linux/minix_fs.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/fcntl.h>
@@ -25,7 +24,6 @@
#define MAX(a,b) (((a)>(b))?(a):(b))
#include <linux/fs.h>
-#include <linux/minix_fs.h>
/*
* Write to a file (through the page cache).