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

Commit 561c5cf9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: Remove autofs3 



autofs3 was moved to staging in 2.6.37, so we can
remove it in the 2.6.39 merge window. If we have
a reason to bring it back after that, this patch
can get reverted.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
About-fscking-timed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Ian Kent <raven@themaw.net>
Cc: autofs@linux.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8aea5882

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -3559,12 +3559,6 @@ W: http://lse.sourceforge.net/kdump/ 
S:	Maintained

F:	Documentation/kdump/



KERNEL AUTOMOUNTER (AUTOFS)

M:	"H. Peter Anvin" <hpa@zytor.com>

L:	autofs@linux.kernel.org

S:	Obsolete

F:	drivers/staging/autofs/



KERNEL AUTOMOUNTER v4 (AUTOFS4)

M:	Ian Kent <raven@themaw.net>

L:	autofs@linux.kernel.org

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ source "drivers/staging/frontier/Kconfig" 


source "drivers/staging/pohmelfs/Kconfig"



source "drivers/staging/autofs/Kconfig"



source "drivers/staging/phison/Kconfig"



source "drivers/staging/line6/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ obj-$(CONFIG_RTS_PSTOR) += rts_pstor/ 
obj-$(CONFIG_SPECTRA)		+= spectra/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_AUTOFS_FS)		+= autofs/

obj-$(CONFIG_IDE_PHISON)	+= phison/

obj-$(CONFIG_LINE6_USB)		+= line6/

obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/

drivers/staging/autofs/Kconfig

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
config AUTOFS_FS

	tristate "Kernel automounter support"

	depends on BKL # unfixable, just use autofs4

	help

	  The automounter is a tool to automatically mount remote file systems

	  on demand. This implementation is partially kernel-based to reduce

	  overhead in the already-mounted case; this is unlike the BSD

	  automounter (amd), which is a pure user space daemon.



	  To use the automounter you need the user-space tools from the autofs

	  package; you can find the location in <file:Documentation/Changes>.

	  You also want to answer Y to "NFS file system support", below.



	  If you want to use the newer version of the automounter with more

	  features, say N here and say Y to "Kernel automounter v4 support",

	  below.



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

	  called autofs.



	  If you are not a part of a fairly large, distributed network, you

	  probably do not need an automounter, and can say N here.

drivers/staging/autofs/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#

# Makefile for the linux autofs-filesystem routines.

#



obj-$(CONFIG_AUTOFS_FS) += autofs.o



autofs-y := dirhash.o init.o inode.o root.o symlink.o waitq.o