diff options
| author | davem <davem> | 2001-08-27 22:13:49 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-08-27 22:13:49 +0000 |
| commit | a9f50bdf0e7ad531b35be76e8fe9dddcace257b6 (patch) | |
| tree | 7572c7eddeecd7e267ccf0533982cf0e3762128b /fs | |
| parent | 08e4bdb3f45d4cfb4c5e795dbd2a238aef6abb5c (diff) | |
| download | netdev-vger-cvs-a9f50bdf0e7ad531b35be76e8fe9dddcace257b6.tar.gz | |
Fix merge errors.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ntfs/attr.c | 1 | ||||
| -rw-r--r-- | fs/ntfs/fs.c | 1 | ||||
| -rw-r--r-- | fs/ntfs/inode.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/fs/ntfs/attr.c b/fs/ntfs/attr.c index 9e11df4f6..80706fdf0 100644 --- a/fs/ntfs/attr.c +++ b/fs/ntfs/attr.c @@ -13,7 +13,6 @@ #include "attr.h" #include <linux/errno.h> -#include <linux/kernel.h> #include "macros.h" #include "support.h" #include "util.h" diff --git a/fs/ntfs/fs.c b/fs/ntfs/fs.c index 3f8519b4f..42659955e 100644 --- a/fs/ntfs/fs.c +++ b/fs/ntfs/fs.c @@ -26,7 +26,6 @@ #include <linux/locks.h> #include <linux/init.h> #include <linux/smp_lock.h> -#include <linux/kernel.h> #include <asm/page.h> #ifndef NLS_MAX_CHARSET_SIZE diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 05304757f..bf66e1eb9 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -20,7 +20,6 @@ #include "dir.h" #include "support.h" #include "util.h" -#include <linux/kernel.h> #include <linux/smp_lock.h> typedef struct { |