diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
| commit | ca65be80fd770188b15b4aecdd245ddbeb7f46ed (patch) | |
| tree | b76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/conf/options | |
| parent | 4104449570e3e74d77537f3a798fbdd632ad311c (diff) | |
| parent | fb64e73880228db0132e7001564d85d5e33a40ea (diff) | |
| download | src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.tar.gz src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.zip | |
Merge ^/head r279313 through r279595.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279596
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 08a5523e2d31..2d6d54b2e24e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -173,6 +173,7 @@ NO_SYSCTL_DESCR opt_global.h NSWBUF_MIN opt_swap.h MBUF_PACKET_ZONE_DISABLE opt_global.h PANIC_REBOOT_WAIT_TIME opt_panic.h +PCI_IOV opt_global.h PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h PPS_SYNC opt_ntp.h |