diff options
author | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
commit | ee871b6440719fbe58a0cb8e994ad543265f4e1a (patch) | |
tree | 5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/isa | |
parent | f0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff) | |
download | FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz |
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/atrtc.c | 4 | ||||
-rw-r--r-- | sys/isa/sio.c | 4 | ||||
-rw-r--r-- | sys/isa/syscons_isa.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 1c8d8f6..188e20b 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.141 1999/07/28 20:22:30 msmith Exp $ + * $Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $ */ /* @@ -59,10 +59,10 @@ #include <sys/lock.h> #endif #include <sys/sysctl.h> +#include <sys/cons.h> #include <machine/clock.h> #ifdef CLK_CALIBRATION_LOOP -#include <machine/cons.h> #endif #include <machine/cputypes.h> #include <machine/frame.h> diff --git a/sys/isa/sio.c b/sys/isa/sio.c index d36318d..d6d8fd4 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.252 1999/07/04 14:58:35 phk Exp $ + * $Id: sio.c,v 1.253 1999/08/08 20:25:14 phk Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -2624,7 +2624,7 @@ disc_optim(tp, t, com) /* * Following are all routines needed for SIO to act as console */ -#include <machine/cons.h> +#include <sys/cons.h> struct siocnstate { u_char dlbl; diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index 1104e26..499a902 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons_isa.c,v 1.5 1999/06/22 14:13:41 yokota Exp $ + * $Id: syscons_isa.c,v 1.6 1999/06/24 09:06:48 yokota Exp $ */ #include "sc.h" @@ -36,8 +36,8 @@ #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> +#include <sys/cons.h> -#include <machine/cons.h> #include <machine/console.h> #ifdef __i386__ |