final version

SCCS-vsn: sys/i386/i386/cons.h 7.2

diff --git a/usr/src/sys/i386/i386/cons.h b/usr/src/sys/i386/i386/cons.h
index 4fb8dbc..d1aea23 100644 (file)
--- a/usr/src/sys/i386/i386/cons.h
+++ b/usr/src/sys/i386/i386/cons.h
@@ -1,31 +1,18 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- * from: Utah $Hdr: cons.h 1.1 90/07/09$
- *
- *     @(#)cons.h      7.3 (Berkeley) 11/2/90
+ *     @(#)cons.h      7.2 (Berkeley) %G%

  */
 
  */
 

+

 struct consdev {
        int     (*cn_probe)();  /* probe hardware and fill in consdev info */
        int     (*cn_init)();   /* turn on as console */
 struct consdev {
        int     (*cn_probe)();  /* probe hardware and fill in consdev info */
        int     (*cn_init)();   /* turn on as console */