diff options
| author | attilio <attilio@FreeBSD.org> | 2013-03-07 23:52:15 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-03-07 23:52:15 +0000 |
| commit | 993799493c64eb0b9faeab971fbe4ecfe0214278 (patch) | |
| tree | 682d8b7873b11a4587bc83365e5517e0bf3b1d56 /sys/conf | |
| parent | 82aa86d64f200298024bc532c74e5e24a0710487 (diff) | |
| parent | 640e058da3cee2710fd66a67abbb548aad74104e (diff) | |
| download | FreeBSD-src-993799493c64eb0b9faeab971fbe4ecfe0214278.zip FreeBSD-src-993799493c64eb0b9faeab971fbe4ecfe0214278.tar.gz | |
Merge from vmcontention
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 10 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 10 | ||||
| -rw-r--r-- | sys/conf/options | 3 |
3 files changed, 13 insertions, 10 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 131a1e7..5e659b9 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -393,11 +393,11 @@ dev/virtio/virtio.c optional virtio dev/virtio/virtqueue.c optional virtio dev/virtio/virtio_bus_if.m optional virtio dev/virtio/virtio_if.m optional virtio -dev/virtio/pci/virtio_pci.c optional virtio_pci virtio pci -dev/virtio/network/if_vtnet.c optional vtnet virtio -dev/virtio/block/virtio_blk.c optional virtio_blk virtio -dev/virtio/balloon/virtio_balloon.c optional virtio_balloon virtio -dev/virtio/scsi/virtio_scsi.c optional virtio_scsi virtio scbus +dev/virtio/pci/virtio_pci.c optional virtio_pci +dev/virtio/network/if_vtnet.c optional vtnet +dev/virtio/block/virtio_blk.c optional virtio_blk +dev/virtio/balloon/virtio_balloon.c optional virtio_balloon +dev/virtio/scsi/virtio_scsi.c optional virtio_scsi isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/kern_clocksource.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index fd536af..f4c595a 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -374,11 +374,11 @@ dev/virtio/virtio.c optional virtio dev/virtio/virtqueue.c optional virtio dev/virtio/virtio_bus_if.m optional virtio dev/virtio/virtio_if.m optional virtio -dev/virtio/pci/virtio_pci.c optional virtio_pci virtio pci -dev/virtio/network/if_vtnet.c optional vtnet virtio -dev/virtio/block/virtio_blk.c optional virtio_blk virtio -dev/virtio/balloon/virtio_balloon.c optional virtio_balloon virtio -dev/virtio/scsi/virtio_scsi.c optional virtio_scsi virtio scbus +dev/virtio/pci/virtio_pci.c optional virtio_pci +dev/virtio/network/if_vtnet.c optional vtnet +dev/virtio/block/virtio_blk.c optional virtio_blk +dev/virtio/balloon/virtio_balloon.c optional virtio_balloon +dev/virtio/scsi/virtio_scsi.c optional virtio_scsi i386/acpica/acpi_machdep.c optional acpi acpi_wakecode.o optional acpi \ dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \ diff --git a/sys/conf/options b/sys/conf/options index 75d0c97..ec9271d 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -329,6 +329,9 @@ SCSI_PT_DEFAULT_TIMEOUT opt_pt.h # Options used only in cam/scsi/scsi_ses.c SES_ENABLE_PASSTHROUGH opt_ses.h +# Options used only in cam/ctl +CTL_DISABLE opt_ctl.h + # Options used in dev/sym/ (Symbios SCSI driver). SYM_SETUP_LP_PROBE_MAP opt_sym.h #-Low Priority Probe Map (bits) # Allows the ncr to take precedence |
