---

yaml --- r: 235722 b: refs/heads/master c: 561c5cf h: refs/heads/master v: v3
git-mirror · Jan 31, 2011 · ee07c96 · ee07c96
1 parent 2e5ce65
commit ee07c96
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 1,691 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aea5882c54feb246ef20399cc55ae4672697ac0
+refs/heads/master: 561c5cf9236a7eb5a52971b6e7e02c5bd094c6d5
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -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

diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -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"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -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/

diff --git a/trunk/drivers/staging/autofs/Kconfig b/trunk/drivers/staging/autofs/Kconfig
diff --git a/trunk/drivers/staging/autofs/Makefile b/trunk/drivers/staging/autofs/Makefile
diff --git a/trunk/drivers/staging/autofs/TODO b/trunk/drivers/staging/autofs/TODO
diff --git a/trunk/drivers/staging/autofs/autofs_i.h b/trunk/drivers/staging/autofs/autofs_i.h