diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /fs/ext2 | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/balloc.c | 1 | ||||
| -rw-r--r-- | fs/ext2/ialloc.c | 1 | ||||
| -rw-r--r-- | fs/ext2/super.c | 1 | ||||
| -rw-r--r-- | fs/ext2/xattr.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 433a213a8bd9..d4870432ecfc 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include "ext2.h" | 14 | #include "ext2.h" |
| 16 | #include <linux/quotaops.h> | 15 | #include <linux/quotaops.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 308c252568c6..de85c61c58c5 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 12 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/quotaops.h> | 15 | #include <linux/quotaops.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 18 | #include <linux/backing-dev.h> | 17 | #include <linux/backing-dev.h> |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index d4233b2e6436..9f43879d6d68 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h index 67cfeb66e897..bf8175b2ced9 100644 --- a/fs/ext2/xattr.h +++ b/fs/ext2/xattr.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> | 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/xattr.h> | 10 | #include <linux/xattr.h> |
| 12 | 11 | ||