diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:25:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:25:36 -0800 |
| commit | ebbe46f73a11a667df59cb8e58b371c0a35f29d0 (patch) | |
| tree | d8063d028d95c77ad15b3ca53ddc0f2c7efbaf25 /fs/Makefile | |
| parent | 901ea4a07988043ff8c6f4f275ab680a23b8bbcd (diff) | |
| parent | 419ee448ff76aef13526a99c2dc39ba3ae1f0970 (diff) | |
Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
Remove JFFS (version 1), as scheduled.
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index b9ffa63f77f..9edf4112bee 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -94,7 +94,6 @@ obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_NTFS_FS) += ntfs/ obj-$(CONFIG_UFS_FS) += ufs/ obj-$(CONFIG_EFS_FS) += efs/ -obj-$(CONFIG_JFFS_FS) += jffs/ obj-$(CONFIG_JFFS2_FS) += jffs2/ obj-$(CONFIG_AFFS_FS) += affs/ obj-$(CONFIG_ROMFS_FS) += romfs/ |