diff options
author | nyan <nyan@FreeBSD.org> | 2000-07-11 12:50:34 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2000-07-11 12:50:34 +0000 |
commit | b5738d479e0eaad924b34c5d0b2d67227187006f (patch) | |
tree | cc0ed6121e6e56a5498b37cea5f448af592d36c6 /sys/conf/files.pc98 | |
parent | 7716c5370ad4c724650bb6def35750d561bc11d2 (diff) | |
download | FreeBSD-src-b5738d479e0eaad924b34c5d0b2d67227187006f.zip FreeBSD-src-b5738d479e0eaad924b34c5d0b2d67227187006f.tar.gz |
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
Diffstat (limited to 'sys/conf/files.pc98')
-rw-r--r-- | sys/conf/files.pc98 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 315e1cb..49822ca 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -220,7 +220,7 @@ i386/isa/pcvt/pcvt_sup.c optional vt i386/isa/pcvt/pcvt_vtf.c optional vt i386/isa/prof_machdep.c optional profiling-routine i386/isa/rc.c count rc -i386/isa/rp.c optional rp +#i386/isa/rp.c optional rp i386/isa/scd.c count scd i386/isa/sound/ad1848.c optional css i386/isa/sound/ad1848.c optional gus |