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/jffs | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/jffs')
| -rw-r--r-- | fs/jffs/intrep.c | 1 | ||||
| -rw-r--r-- | fs/jffs/jffs_fm.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c index 5371a40313..9000f1effe 100644 --- a/fs/jffs/intrep.c +++ b/fs/jffs/intrep.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | * | 55 | * |
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 60 | #include <linux/slab.h> | 59 | #include <linux/slab.h> |
| 61 | #include <linux/jffs.h> | 60 | #include <linux/jffs.h> |
diff --git a/fs/jffs/jffs_fm.h b/fs/jffs/jffs_fm.h index c794d923df..9ee6ad29ef 100644 --- a/fs/jffs/jffs_fm.h +++ b/fs/jffs/jffs_fm.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __LINUX_JFFS_FM_H__ | 20 | #ifndef __LINUX_JFFS_FM_H__ |
| 21 | #define __LINUX_JFFS_FM_H__ | 21 | #define __LINUX_JFFS_FM_H__ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/jffs.h> | 24 | #include <linux/jffs.h> |
| 26 | #include <linux/mtd/mtd.h> | 25 | #include <linux/mtd/mtd.h> |