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/jffs2/compr_zlib.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/jffs2/compr_zlib.c')
| -rw-r--r-- | fs/jffs2/compr_zlib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c index 5c63e0cdcf4c..3681d0728ac7 100644 --- a/fs/jffs2/compr_zlib.c +++ b/fs/jffs2/compr_zlib.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #error "The userspace support got too messy and was removed. Update your mkfs.jffs2" | 15 | #error "The userspace support got too messy and was removed. Update your mkfs.jffs2" |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |