Yoshihiro Takahashi 6ffb65e8b1 Merged from the following changes. ... sys/conf/Makefile.i386 1.211 sys/conf/files.i386 1.329 sys/isa/fd.c 1.186, 1.188 and 1.189 sys/isa/sio.c 1.305 and 1.317 sys/i386/conf/GENERIC 1.270, 1.281, 1.282 and 1.284 sys/i386/i386/machdep.c 1.419 sys/i386/i386/userconfig.c 1.184		2000-11-05 14:31:19 +00:00
..
30line.h	Fixed warnings.	2000-10-15 04:54:17 +00:00
cbus_dma.c	Merged from sys/i386/isa/isa_dma.c revision 1.6.	2000-06-28 03:18:51 +00:00
cbus.h
clock.c	Catch up to the new swi code.	2000-10-25 20:21:42 +00:00
fdc.c	Merged from the following changes.	2000-11-05 14:31:19 +00:00
fdcreg.h
gdc.c	Restore GDC mode to initial mode instead of 24KHz.	2000-10-28 11:27:56 +00:00
olpt.c	Remove unneeded #include <machine/clock.h>	2000-10-15 14:19:01 +00:00
pckbd.c	Used kbio.h and consio.h instead of machine/console.h.	2000-10-20 10:35:44 +00:00
pcrtc.c	Catch up to the new swi code.	2000-10-25 20:21:42 +00:00
ppc.c	Remove unneeded #include <machine/clock.h>	2000-10-15 14:19:01 +00:00
ppcreg.h
sc_machdep.h
scgdcrndr.c	Fixed include files to use sys/{cons,fb,kb}io.h instead of	2000-10-09 11:07:18 +00:00
scterm-sck.c	Merged from sys/dev/syscons/scterm-sc.c revisions from 1.8 to 1.12.	2000-07-30 08:12:08 +00:00
scvtb.c	Fixed include files to use sys/{cons,fb,kb}io.h instead of	2000-10-09 11:07:18 +00:00
sio.c	Merged from the following changes.	2000-11-05 14:31:19 +00:00
syscons_cbus.c	Used kbio.h and consio.h instead of machine/console.h.	2000-10-20 10:35:44 +00:00