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/isofs | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/isofs')
| -rw-r--r-- | fs/isofs/compress.c | 1 | ||||
| -rw-r--r-- | fs/isofs/dir.c | 1 | ||||
| -rw-r--r-- | fs/isofs/inode.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c index 3a39158cca96..731816332b12 100644 --- a/fs/isofs/compress.c +++ b/fs/isofs/compress.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Transparent decompression of files on an iso9660 filesystem | 16 | * Transparent decompression of files on an iso9660 filesystem |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | 21 | ||
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 5440ea292c69..27e276987fd2 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * isofs directory handling functions | 11 | * isofs directory handling functions |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 15 | #include "isofs.h" | 14 | #include "isofs.h" |
| 16 | 15 | ||
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index bb11c7fb4019..14391361c886 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 2004 Paul Serice - NFS Export Operations | 11 | * 2004 Paul Serice - NFS Export Operations |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | 16 | ||