diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-05-16 21:56:33 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-05-16 21:56:33 +0000 |
| commit | ebb52114cf1aa84c06d0ab3acef6f36785f31861 (patch) | |
| tree | e352def97b15ed43cab211eaae322dcec681e70f /sys/conf/options.i386 | |
| parent | 81a04e5982f8e2a0559199cee636afbbaae07df1 (diff) | |
| download | FreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.zip FreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.tar.gz | |
MFC r264269, r264282, r264280, r264291, r264276, r264314
Merge sson's binmiscctl and image activator features to stable/10
Submitted by: sson@freebsd.org
Diffstat (limited to 'sys/conf/options.i386')
| -rw-r--r-- | sys/conf/options.i386 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 3638266..7e64a80 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -26,6 +26,7 @@ IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h +IMAGACT_BINMISC opt_binmisc.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h |
