diff options
| author | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
| commit | 148ce94bebd89be1aab174e5e4af889f43ffdd6d (patch) | |
| tree | 76c7c637f26dd9c707e9bc4cb86db9ba6765d078 /sys/pc98/cbus | |
| parent | 7b9ecd2de3dd0e21793ef47de26c51dbf4b2dff9 (diff) | |
| download | FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.zip FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.tar.gz | |
Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h. Fix a couple of typos.
Submitted by: The FreeBSD(98) Development Team.
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 14 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 14 | ||||
| -rw-r--r-- | sys/pc98/cbus/sio.c | 4 |
3 files changed, 12 insertions, 20 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index b9547fd..e0f9221 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.3 1996/08/30 10:42:58 asami Exp $ + * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ */ /* @@ -46,7 +46,7 @@ /* * modified for PC98 - * $Id: clock.c,v 1.3 1996/08/30 10:42:58 asami Exp $ + * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ */ /* @@ -68,14 +68,12 @@ #include <machine/cpu.h> #include <machine/frame.h> +#include <i386/isa/icu.h> #ifdef PC98 -#include <sys/syslog.h> -#include <pc98/pc98/icu.h> #include <pc98/pc98/pc98.h> #include <i386/isa/isa_device.h> #include <pc98/pc98/timerreg.h> #else -#include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/rtc.h> @@ -742,13 +740,11 @@ startrtclock() #ifndef AUTO_CLOCK if (pc98_machine_type & M_8M) { #ifndef PC98_8M - log(LOG_EMERG, - "you must reconfig a kernel with \"PC98_8M\" option.\n"); + printf("you must reconfig a kernel with \"PC98_8M\" option.\n"); #endif } else { #ifdef PC98_8M - log(LOG_EMERG, - "You must reconfig a kernel without \"PC98_8M\" option.\n"); + printf("You must reconfig a kernel without \"PC98_8M\" option.\n"); #endif } #else /* AUTO_CLOCK */ diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index b9547fd..e0f9221 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.3 1996/08/30 10:42:58 asami Exp $ + * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ */ /* @@ -46,7 +46,7 @@ /* * modified for PC98 - * $Id: clock.c,v 1.3 1996/08/30 10:42:58 asami Exp $ + * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ */ /* @@ -68,14 +68,12 @@ #include <machine/cpu.h> #include <machine/frame.h> +#include <i386/isa/icu.h> #ifdef PC98 -#include <sys/syslog.h> -#include <pc98/pc98/icu.h> #include <pc98/pc98/pc98.h> #include <i386/isa/isa_device.h> #include <pc98/pc98/timerreg.h> #else -#include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/rtc.h> @@ -742,13 +740,11 @@ startrtclock() #ifndef AUTO_CLOCK if (pc98_machine_type & M_8M) { #ifndef PC98_8M - log(LOG_EMERG, - "you must reconfig a kernel with \"PC98_8M\" option.\n"); + printf("you must reconfig a kernel with \"PC98_8M\" option.\n"); #endif } else { #ifdef PC98_8M - log(LOG_EMERG, - "You must reconfig a kernel without \"PC98_8M\" option.\n"); + printf("You must reconfig a kernel without \"PC98_8M\" option.\n"); #endif } #else /* AUTO_CLOCK */ diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 98feda2..da16792 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.3 1996/08/31 15:07:20 asami Exp $ + * $Id: sio.c,v 1.4 1996/09/03 10:23:59 asami Exp $ */ #include "opt_comconsole.h" @@ -139,7 +139,7 @@ #ifdef PC98 #include <pc98/pc98/pc98.h> -#include <pc98/pc98/icu.h> +#include <i386/isa/icu.h> #include <i386/isa/isa_device.h> #include <pc98/pc98/sioreg.h> #include <pc98/pc98/ic/i8251.h> |
