summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile6
-rw-r--r--sys/modules/fdesc/Makefile10
-rw-r--r--sys/modules/fdescfs/Makefile4
-rw-r--r--sys/modules/nullfs/Makefile2
-rw-r--r--sys/modules/portal/Makefile10
-rw-r--r--sys/modules/portalfs/Makefile4
-rw-r--r--sys/modules/procfs/Makefile2
-rw-r--r--sys/modules/umapfs/Makefile2
-rw-r--r--sys/modules/union/Makefile10
-rw-r--r--sys/modules/unionfs/Makefile4
10 files changed, 12 insertions, 42 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index eac6ea8..f93f393 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -7,12 +7,12 @@ _random= random
.endif
SUBDIR= 3dfx accf_data accf_http agp aha amr an aue \
- cam ccd cd9660 coda cue dc de dgm digi ed fdesc fxp if_disc if_ef \
+ cam ccd cd9660 coda cue dc de dgm digi ed fdescfs fxp if_disc if_ef \
if_ppp if_sl if_tap if_tun ip6fw ipfilter ipfw ispfw joy kue \
libmchain linux lnc md mfs mii mlx msdos ncp netgraph nfs nge ntfs \
- nullfs nwfs pcn portal procfs ${_random} \
+ nullfs nwfs pcn portalfs procfs ${_random} \
rl rp sf sis sk sn sound sppp ste sym syscons sysvipc ti tl twe tx \
- udbp ugen uhid ukbd ulpt umapfs umass umodem ums union urio usb \
+ udbp ugen uhid ukbd ulpt umapfs umass umodem ums unionfs urio usb \
uscanner \
vinum vpo vr vx wb wx xl
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
deleted file mode 100644
index 4344517..0000000
--- a/sys/modules/fdesc/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../miscfs/fdesc
-
-KMOD= fdesc
-SRCS= vnode_if.h \
- fdesc_vfsops.c fdesc_vnops.c
-NOMAN=
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index 4344517..dc8b6db 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/fdesc
+.PATH: ${.CURDIR}/../../fs/fdescfs
-KMOD= fdesc
+KMOD= fdescfs
SRCS= vnode_if.h \
fdesc_vfsops.c fdesc_vnops.c
NOMAN=
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 3df3d26..d41ac21 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/nullfs
+.PATH: ${.CURDIR}/../../fs/nullfs
KMOD= nullfs
SRCS= vnode_if.h \
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
deleted file mode 100644
index a14a8fa..0000000
--- a/sys/modules/portal/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../miscfs/portal
-
-KMOD= portal
-SRCS= vnode_if.h \
- portal_vfsops.c portal_vnops.c
-NOMAN=
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index a14a8fa..f23e69e 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/portal
+.PATH: ${.CURDIR}/../../fs/portalfs
-KMOD= portal
+KMOD= portalfs
SRCS= vnode_if.h \
portal_vfsops.c portal_vnops.c
NOMAN=
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index d132b0d..3d9338e 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/procfs
+.PATH: ${.CURDIR}/../../fs/procfs
KMOD= procfs
SRCS= vnode_if.h \
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 279a3a4..346f903 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/umapfs
+.PATH: ${.CURDIR}/../../fs/umapfs
KMOD= umap
SRCS= vnode_if.h \
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
deleted file mode 100644
index 8f3f852..0000000
--- a/sys/modules/union/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../miscfs/union
-
-KMOD= union
-SRCS= vnode_if.h \
- union_subr.c union_vfsops.c union_vnops.c
-NOMAN=
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 8f3f852..2f80909 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../miscfs/union
+.PATH: ${.CURDIR}/../../fs/unionfs
-KMOD= union
+KMOD= unionfs
SRCS= vnode_if.h \
union_subr.c union_vfsops.c union_vnops.c
NOMAN=
OpenPOWER on IntegriCloud