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

Commit a1c70a75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'Kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/misc 

* 'Kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/misc: (36 commits)
  fs/Kconfig: move 9p out
  fs/Kconfig: move afs out
  fs/Kconfig: move coda out
  fs/Kconfig: move the rest of ncpfs out
  fs/Kconfig: move smbfs out
  fs/Kconfig: move sunrpc out
  fs/Kconfig: move nfsd out
  fs/Kconfig: move nfs out
  fs/Kconfig: move ufs out
  fs/Kconfig: move sysv out
  fs/Kconfig: move romfs out
  fs/Kconfig: move qnx4 out
  fs/Kconfig: move hpfs out
  fs/Kconfig: move omfs out
  fs/Kconfig: move minix out
  fs/Kconfig: move vxfs out
  fs/Kconfig: move squashfs out
  fs/Kconfig: move cramfs out
  fs/Kconfig: move efs out
  fs/Kconfig: move bfs out
  ...
parents 3632dee2 0fcb4408

fs/9p/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
config 9P_FS

	tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"

	depends on INET && NET_9P && EXPERIMENTAL

	help

	  If you say Y here, you will get experimental support for

	  Plan 9 resource sharing via the 9P2000 protocol.



	  See <http://v9fs.sf.net> for more information.



	  If unsure, say N.

fs/Kconfig

+38 −1363

File changed.

Preview size limit exceeded, changes collapsed.

fs/adfs/Kconfig

0 → 100644
+27 −0
Original line number Diff line number Diff line 
config ADFS_FS

	tristate "ADFS file system support (EXPERIMENTAL)"

	depends on BLOCK && EXPERIMENTAL

	help

	  The Acorn Disc Filing System is the standard file system of the

	  RiscOS operating system which runs on Acorn's ARM-based Risc PC

	  systems and the Acorn Archimedes range of machines. If you say Y

	  here, Linux will be able to read from ADFS partitions on hard drives

	  and from ADFS-formatted floppy discs. If you also want to be able to

	  write to those devices, say Y to "ADFS write support" below.



	  The ADFS partition should be the first partition (i.e.,

	  /dev/[hs]d?1) on each of your drives. Please read the file

	  <file:Documentation/filesystems/adfs.txt> for further details.



	  To compile this code as a module, choose M here: the module will be

	  called adfs.



	  If unsure, say N.



config ADFS_FS_RW

	bool "ADFS write support (DANGEROUS)"

	depends on ADFS_FS

	help

	  If you say Y here, you will be able to write to ADFS partitions on

	  hard drives and ADFS-formatted floppy disks. This is experimental

	  codes, so if you're unsure, say N.

fs/affs/Kconfig

0 → 100644
+21 −0
Original line number Diff line number Diff line 
config AFFS_FS

	tristate "Amiga FFS file system support (EXPERIMENTAL)"

	depends on BLOCK && EXPERIMENTAL

	help

	  The Fast File System (FFS) is the common file system used on hard

	  disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20).  Say Y

	  if you want to be able to read and write files from and to an Amiga

	  FFS partition on your hard drive.  Amiga floppies however cannot be

	  read with this driver due to an incompatibility of the floppy

	  controller used in an Amiga and the standard floppy controller in

	  PCs and workstations. Read <file:Documentation/filesystems/affs.txt>

	  and <file:fs/affs/Changes>.



	  With this driver you can also mount disk files used by Bernd

	  Schmidt's Un*X Amiga Emulator

	  (<http://www.freiburg.linux.de/~uae/>).

	  If you want to do this, you will also need to say Y or M to "Loop

	  device support", above.



	  To compile this file system support as a module, choose M here: the

	  module will be called affs.  If unsure, say N.

fs/afs/Kconfig

0 → 100644
+21 −0
Original line number Diff line number Diff line 
config AFS_FS

	tristate "Andrew File System support (AFS) (EXPERIMENTAL)"

	depends on INET && EXPERIMENTAL

	select AF_RXRPC

	help

	  If you say Y here, you will get an experimental Andrew File System

	  driver. It currently only supports unsecured read-only AFS access.



	  See <file:Documentation/filesystems/afs.txt> for more information.



	  If unsure, say N.



config AFS_DEBUG

	bool "AFS dynamic debugging"

	depends on AFS_FS

	help

	  Say Y here to make runtime controllable debugging messages appear.



	  See <file:Documentation/filesystems/afs.txt> for more information.



	  If unsure, say N.