diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-24 07:16:07 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-24 07:16:07 -0200 |
commit | 0198089008314a6920ed8427f91c2b734c0d4369 (patch) | |
tree | 1af97d1de7dc7828ca8ee6cbf4fcded1d7f2c1f3 /sys/conf/options | |
parent | a569aca1d382bf02a5a2d9bd8a9b0e0bb6450cca (diff) | |
parent | 4b6a65d9c084e4d5381e5bccbe02d1fb30290b90 (diff) | |
download | FreeBSD-src-0198089008314a6920ed8427f91c2b734c0d4369.zip FreeBSD-src-0198089008314a6920ed8427f91c2b734c0d4369.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/conf/options')
-rw-r--r-- | sys/conf/options | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options index 9505849..96253be 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -83,6 +83,7 @@ COMPAT_FREEBSD4 opt_compat.h COMPAT_FREEBSD5 opt_compat.h COMPAT_FREEBSD6 opt_compat.h COMPAT_FREEBSD7 opt_compat.h +COMPAT_LINUXKPI opt_compat.h COMPILING_LINT opt_global.h COMPRESS_USER_CORES opt_core.h CY_PCI_FASTINTR |