summaryrefslogtreecommitdiffstats
path: root/sys/conf/files.amd64
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-07-09 05:05:13 +0000
committerimp <imp@FreeBSD.org>2004-07-09 05:05:13 +0000
commitf4c76ff4de3a4a1fc4c060c05168217f72049a3d (patch)
tree0e084855fc11d2ed9013d7c24a6360e0826fedd0 /sys/conf/files.amd64
parent612aa594734cbe6fb31bc27899b6844713cc8f21 (diff)
downloadFreeBSD-src-f4c76ff4de3a4a1fc4c060c05168217f72049a3d.zip
FreeBSD-src-f4c76ff4de3a4a1fc4c060c05168217f72049a3d.tar.gz
Fix mismerge of fdc. Also, OLDCARD never was supported on amd64, so
remove fdc attachment for it.
Diffstat (limited to 'sys/conf/files.amd64')
-rw-r--r--sys/conf/files.amd642
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index bc567e4..f7a04d4 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -100,8 +100,8 @@ dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
+dev/fdc/fdc.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
-dev/fdc/fdc_pccard.c optional fdc card
dev/fdc/fdc_pccard.c optional fdc pccard
dev/kbd/atkbd.c optional atkbd
dev/kbd/atkbdc.c optional atkbdc
OpenPOWER on IntegriCloud