Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (ebbe46f7) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -283,13 +283,6 @@ Who: Len Brown <len.brown@intel.com>

		---------------------------

		What: JFFS (version 1)
		When: 2.6.21
		Why: Unmaintained for years, superceded by JFFS2 for years.
		Who: Jeff Garzik <jeff@garzik.org>

		---------------------------

		What: sk98lin network driver
		When: July 2007
		Why: In kernel tree version of driver is unmaintained. Sk98lin driver

+0 −26

Original line number	Diff line number	Diff line
		@@ -1189,32 +1189,6 @@ config EFS_FS
		To compile the EFS file system support as a module, choose M here: the
		module will be called efs.

		config JFFS_FS
		tristate "Journalling Flash File System (JFFS) support"
		depends on MTD && BLOCK && BROKEN
		help
		JFFS is the Journalling Flash File System developed by Axis
		Communications in Sweden, aimed at providing a crash/powerdown-safe
		file system for disk-less embedded devices. Further information is
		available at (<http://developer.axis.com/software/jffs/>).

		NOTE: This filesystem is deprecated and is scheduled for removal in
		2.6.21. See Documentation/feature-removal-schedule.txt

		config JFFS_FS_VERBOSE
		int "JFFS debugging verbosity (0 = quiet, 3 = noisy)"
		depends on JFFS_FS
		default "0"
		help
		Determines the verbosity level of the JFFS debugging messages.

		config JFFS_PROC_FS
		bool "JFFS stats available in /proc filesystem"
		depends on JFFS_FS && PROC_FS
		help
		Enabling this option will cause statistics from mounted JFFS file systems
		to be made available to the user in the /proc/fs/jffs/ directory.

		config JFFS2_FS
		tristate "Journalling Flash File System v2 (JFFS2) support"
		select CRC32

+0 −1

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		#
		# Makefile for the linux Journalling Flash FileSystem (JFFS) routines.
		#
		# $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $
		#

		obj-$(CONFIG_JFFS_FS) += jffs.o

		jffs-y := jffs_fm.o intrep.o inode-v23.o
		jffs-$(CONFIG_JFFS_PROC_FS) += jffs_proc.o
		jffs-objs := $(jffs-y)

deleted100644 → 0

+0 −1847

File deleted.

Preview size limit exceeded, changes collapsed.