diff options
| author | marius <marius@FreeBSD.org> | 2013-04-06 19:12:49 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2013-04-06 19:12:49 +0000 |
| commit | 769bdd48e62f800a49095832ca9d3bf8e2c4db7b (patch) | |
| tree | beec354e89c1d44f4ee909a0eea535f9fd251eb7 /sys/conf | |
| parent | 916607c00957e1ba06f932ded65c62673d164759 (diff) | |
| download | FreeBSD-src-769bdd48e62f800a49095832ca9d3bf8e2c4db7b.zip FreeBSD-src-769bdd48e62f800a49095832ca9d3bf8e2c4db7b.tar.gz | |
- With the demise of !ATA_CAM, ATA_STATIC_ID is the only ata(4) related
option left but actually consumed by ada(4), so move it to opt_ada.h
and get rid of opt_ata.h.
- Fix stand-alone build of atacore(4) by adding opt_cam.h.
- Use __FBSDID.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/options | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/conf/options b/sys/conf/options index 163358a..63688b7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -312,7 +312,8 @@ SCSI_NO_SENSE_STRINGS opt_scsi.h SCSI_NO_OP_STRINGS opt_scsi.h # Options used only in cam/ata/ata_da.c -ADA_TEST_FAILURE opt_ada.h +ADA_TEST_FAILURE opt_ada.h +ATA_STATIC_ID opt_ada.h # Options used only in cam/scsi/scsi_cd.c CHANGER_MIN_BUSY_SECONDS opt_cd.h @@ -362,11 +363,6 @@ ISP_INTERNAL_TARGET opt_isp.h # Options used only in dev/iscsi ISCSI_INITIATOR_DEBUG opt_iscsi_initiator.h -# Options used in the 'ata' ATA/ATAPI driver -ATA_STATIC_ID opt_ata.h -ATA_NOPCI opt_ata.h -ATA_REQUEST_TIMEOUT opt_ata.h - # Net stuff. ACCEPT_FILTER_DATA ACCEPT_FILTER_DNS |
