Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1843c1a7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: exfat: remove staging version of exfat filesystem"

parents f94ed13b 0c9170fb
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -6158,11 +6158,6 @@ F: include/trace/events/mdio.h
F:	include/uapi/linux/mdio.h
F:	include/uapi/linux/mii.h
EXFAT FILE SYSTEM
M:	Valdis Kletnieks <valdis.kletnieks@vt.edu>
S:	Maintained
F:	drivers/staging/exfat/
EXT2 FILE SYSTEM
M:	Jan Kara <jack@suse.com>
L:	linux-ext4@vger.kernel.org
+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ source "drivers/staging/isdn/Kconfig"
source "drivers/staging/wusbcore/Kconfig"
source "drivers/staging/uwb/Kconfig"

source "drivers/staging/exfat/Kconfig"

source "drivers/staging/qlge/Kconfig"

endif # STAGING
+0 −1
Original line number Diff line number Diff line
@@ -51,5 +51,4 @@ obj-$(CONFIG_KPC2000) += kpc2000/
obj-$(CONFIG_ISDN_CAPI)		+= isdn/
obj-$(CONFIG_UWB)		+= uwb/
obj-$(CONFIG_USB_WUSB)		+= wusbcore/
obj-$(CONFIG_EXFAT_FS)		+= exfat/
obj-$(CONFIG_QLGE)		+= qlge/

drivers/staging/exfat/Kconfig

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
config EXFAT_FS
	tristate "exFAT fs support"
	depends on BLOCK
	select NLS
	help
	  This adds support for the exFAT file system.

config EXFAT_DONT_MOUNT_VFAT
	bool "Prohibit mounting of fat/vfat filesystems by exFAT"
	depends on EXFAT_FS
	default y
	help
	  By default, the exFAT driver will only mount exFAT filesystems, and refuse
	  to mount fat/vfat filesystems.  Set this to 'n' to allow the exFAT driver
	  to mount these filesystems.

config EXFAT_DISCARD
	bool "enable discard support"
	depends on EXFAT_FS
	default y

config EXFAT_DELAYED_SYNC
	bool "enable delayed sync"
	depends on EXFAT_FS
	default n

config EXFAT_KERNEL_DEBUG
	bool "enable kernel debug features via ioctl"
	depends on EXFAT_FS
	default n

config EXFAT_DEBUG_MSG
	bool "print debug messages"
	depends on EXFAT_FS
	default n

config EXFAT_DEFAULT_CODEPAGE
	int "Default codepage for exFAT"
	default 437
	depends on EXFAT_FS
	help
	  This option should be set to the codepage of your exFAT filesystems.

config EXFAT_DEFAULT_IOCHARSET
	string "Default iocharset for exFAT"
	default "utf8"
	depends on EXFAT_FS
	help
	  Set this to the default input/output character set you'd like exFAT to use.

drivers/staging/exfat/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-or-later

obj-$(CONFIG_EXFAT_FS) += exfat.o

exfat-y :=	exfat_core.o	\
		exfat_super.o	\
		exfat_blkdev.o	\
		exfat_cache.o	\
		exfat_nls.o	\
		exfat_upcase.o
Loading