diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
| commit | ce9edcf5b53a0eadcd0f5d25d39b9517f0c5cf40 (patch) | |
| tree | 68072996bde67a3112fcd658713e00679a0c6387 /sys/cam | |
| parent | ef4aaceaa0bcdaa2dd548f53f5c492f7f7d6ba8b (diff) | |
| download | src-ce9edcf5b53a0eadcd0f5d25d39b9517f0c5cf40.tar.gz src-ce9edcf5b53a0eadcd0f5d25d39b9517f0c5cf40.zip | |
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Notes
Notes:
svn path=/head/; revision=49558
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 630b94655005..71c15f796fe9 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_da.c,v 1.29 1999/07/06 01:40:03 mjacob Exp $ + * $Id: scsi_da.c,v 1.30 1999/07/07 18:14:01 mjacob Exp $ */ #include "opt_hw_wdog.h" @@ -40,8 +40,8 @@ #include <sys/diskslice.h> #include <sys/malloc.h> #include <sys/conf.h> +#include <sys/cons.h> -#include <machine/cons.h> #include <machine/md_var.h> #include <vm/vm.h> |