From 9ea5f9db33d7aa9016853b7d5122b331c839fe20 Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Sun, 1 Sep 1996 20:55:21 +0000
Subject: initial commit of split fdc/fd drivers

---
 sys/arch/i386/i386/autoconf.c | 6 +++---
 sys/arch/i386/i386/conf.c     | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'sys/arch/i386')

diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index f5d1c83d4bb..c384d81f62d 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.11 1996/06/16 01:14:56 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.12 1996/09/01 20:55:20 downsj Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -204,8 +204,8 @@ setroot()
 #if NWDC > 0
 extern	struct cfdriver wd_cd;
 #endif
-#include "fdc.h"
-#if NFDC > 0
+#include "fd.h"
+#if NFD > 0
 extern	struct cfdriver fd_cd;
 #endif
 #include "sd.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 5ef2a3dbe7e..d9c4a649715 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 1996/08/29 09:26:04 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 1996/09/01 20:55:20 downsj Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -42,6 +42,7 @@
 bdev_decl(wd);
 bdev_decl(sw);
 #include "fdc.h"
+#include "fd.h"
 bdev_decl(fd);
 #include "wt.h"
 bdev_decl(wt);
@@ -71,7 +72,7 @@ struct bdevsw	bdevsw[] =
 {
 	bdev_disk_init(NWDC,wd),	/* 0: ST506/ESDI/IDE disk */
 	bdev_swap_init(1,sw),		/* 1: swap pseudo-device */
-	bdev_disk_init(NFDC,fd),	/* 2: floppy diskette */
+	bdev_disk_init(NFD,fd),		/* 2: floppy diskette */
 	bdev_tape_init(NWT,wt),		/* 3: QIC-02/QIC-36 tape */
 	bdev_disk_init(NSD,sd),		/* 4: SCSI disk */
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
@@ -217,7 +218,7 @@ struct cdevsw	cdevsw[] =
 #else
 	cdev_tty_init(NCOM,com),	/* 8: serial port */
 #endif
-	cdev_disk_init(NFDC,fd),	/* 9: floppy disk */
+	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
 	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
 	cdev_disk_init(NSCD,scd),	/* 11: Sony CD-ROM */
 	cdev_pc_init(NPC + NVT,pc),	/* 12: PC console */
-- 
cgit v1.2.3