Yoshihiro Takahashi 2446144f7a Merge from the following changes. ...

sys/conf/files.i386		1.321
sys/dev/syscons/syscons.c	1.343
sys/i386/isa/spkr.c		1.46
sys/isa/fd.c			1.183 and 1.185
sys/isa/syscons_isa.c		1.14
sys/isa/vga_isa.c		1.18

2000-07-11 12:50:34 +00:00

..

cbus

Merge from the following changes.

2000-07-11 12:50:34 +00:00

conf

Sync with sys/i386/conf/GENERIC revisions 1.258 and 1.259.

2000-07-04 12:31:46 +00:00

i386

Don't call printf without a format string.

2000-07-10 07:13:36 +00:00

pc98

Merge from the following changes.

2000-07-11 12:50:34 +00:00