vfs_subr2 has lost its will to live. vfs_subr was originally split

into two parts so that some of the routines could be used by rump.
Now that rump uses both vfs_subr and vfs_subr2 and there is no
reason to keep two files lying around, re-unite them.

sys/conf/files

@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.909 2008/06/24 17:32:09 drochner Exp $
+#	$NetBSD: files,v 1.910 2008/07/16 20:06:19 pooka Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -1472,7 +1472,6 @@ file	kern/vfs_init.c
 file	kern/vfs_lockf.c
 file	kern/vfs_lookup.c
 file	kern/vfs_subr.c
-file	kern/vfs_subr2.c
 file	kern/vfs_syscalls.c
 file	kern/vfs_trans.c
 file	kern/vfs_vnops.c

sys/rump/librump/rumpkern/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2008/07/02 23:03:35 he Exp $
+#	$NetBSD: Makefile,v 1.40 2008/07/16 20:06:20 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -23,7 +23,7 @@ SRCS+=	clock_subr.c kern_descrip.c kern_stub.c param.c	\
 	subr_bufq.c subr_hash.c subr_prf2.c subr_specificdata.c		\
 	subr_time.c subr_workqueue.c sys_descrip.c sys_generic.c vfs_bio.c \
 	vfs_cache.c vfs_getcwd.c vfs_hooks.c vfs_init.c vfs_lookup.c	\
-	vfs_subr.c vfs_subr2.c vfs_vnops.c vfs_syscalls.c vnode_if.c \
+	vfs_subr.c vfs_vnops.c vfs_syscalls.c vnode_if.c \
 	subr_kobj.c kern_module.c
 
 # sys/miscfs